Merge branch 'master' of gitlab.fuss.bz.it:fuss-team/fuss-nc

nextcloud-fuss/Dockerfile

@@ -20,7 +20,7 @@ COPY configure-fuss.sh /
 COPY crontab /etc
 COPY 000-default.conf /etc/apache2/sites-available
 
-RUN a2enmod rewrite
+RUN a2enmod rewrite ssl
 
 ENTRYPOINT ["/configure-fuss.sh"]
 CMD ["apache2-foreground"]

nextcloud-fuss/configure-fuss.sh

@@ -25,19 +25,18 @@ test -e /usr/local/share/ca-certificates/fuss.bz.it/fuss.crt || (
 )
 
 # Configure certbot
-if [ ! -e /etc/letsencrypt/live ]; then
+if [ ! -e /etc/letsencrypt/accounts/10.0.101.50\:4001/ ]; then
   certbot register \
     --non-interactive \
     --agree-tos \
     --register-unsafely-without-email \
     --server https://${ACME_SERVER}:4001/acme/acme/directory
-else
-  certbot \
-    --apache \
-    --non-interactive \
-    --server https://${ACME_SERVER}:4001/acme/acme/directory \
-    -d ${NEXTCLOUD_INTERNAL_DOMAIN}
 fi
+certbot \
+  --apache \
+  --non-interactive \
+  --server https://${ACME_SERVER}:4001/acme/acme/directory \
+  -d ${NEXTCLOUD_INTERNAL_DOMAIN}
 
 
 # Enable apps
@@ -130,7 +129,7 @@ EOF
   rm /tmp/fe_conf.txt
 fi
 
-# Install and configure Collabora Online
+# Install and configure the FUSS Online Collaboration Suite
 # at the moment we're unable to reach github assets so we
 # need to use a our own mirror
 rm -rf /var/www/html/apps/richdocuments
@@ -138,8 +137,8 @@ wget -O /tmp/richdocuments.tar.gz https://access.fuss.bz.it/static/nc_cdn/apps/r
 tar -C /var/www/html/apps -xvzf /tmp/richdocuments.tar.gz
 run_as 'php /var/www/html/occ app:enable richdocuments'
 run_as 'php /var/www/html/occ config:app:set richdocuments enabled --value yes'
-run_as 'php /var/www/html/occ config:app:set richdocuments wopi_url --value "https://collabora.access.fuss.bz.it"'
-run_as 'php /var/www/html/occ config:app:set richdocuments public_wopi_url --value "https://collabora.access.fuss.bz.it"'
+run_as 'php /var/www/html/occ config:app:set richdocuments wopi_url --value "https://onlinesuite.access.fuss.bz.it"'
+run_as 'php /var/www/html/occ config:app:set richdocuments public_wopi_url --value "https://onlinesuite.access.fuss.bz.it"'
 
 
 # Start cron

nextcloud-fuss/crontab

@@ -9,3 +9,4 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 
 # m h dom mon dow user	command
 * *	* * *	www-data	php -f /var/www/html/cron.php
+0 * * * * www-data  php /var/www/html/occ files:scan --all