minor fix...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>

nextcloud/make.sh

@@ -19,6 +19,7 @@ readConfig
 
 webAppConfig Nextcloud
 
+
 DFL_ID=${DFL_ID:=1000}
 DFL_CTHOSTNAME=${DFL_CTHOSTNAME:=nextcloud}
 
@@ -41,6 +42,9 @@ LAN_GATE=SKIP
 
 REBOOT=${REBOOT:=1}
 
+# XXX should we ask??
+COLLABORA_OFFICE=${COLLABORA_OFFICE:=1}
+
 readVars
 
 # Nextcloud-specific configuration...
@@ -128,21 +132,8 @@ pctPushAssets $ID
 # XXX need to push proxy config to gate...
 
 # Colabora...
-if false ; then
+if ! [ -z $COLLABORA_OFFICE ] ; then
-	echo "# Colabora office..."
+	echo "# Collabora office..."
-	# apache2...
-	@ lxc-attach $ID -- a2enmod proxy
-	@ lxc-attach $ID -- a2enmod proxy_http
-	@ lxc-attach $ID -- a2enmod proxy_connect
-	@ lxc-attach $ID -- a2enmod proxy_wstunnel
-	# XXX TEST... 
-	@ lxc-attach $ID -- bash -c "\
-		sed -i \
-			-e '/<VirtualHost \*:443>/,/<\/VirtualHost>/ { 
-					/<\/VirtualHost>/ i\    Include /etc/apache2/conf-available/coolwsd.conf
-				}' \
-			/etc/apache2/sites-available/nextcloud.conf"
-	
 	# coolwsd...
 	# see:
 	# 	https://sdk.collaboraonline.com/docs/installation/Configuration.html
@@ -165,19 +156,36 @@ if false ; then
 			'/<ssl /,+5{ s/\(<termination [^>]*>\)false\(</termination>\)/\1true\2/ }' \
 			/etc/coolwsd/coolwsd.xml"
 	@ lxc-attach $ID -- systemctl restart coolswd
+
+	# apache2...
+	@ lxc-attach $ID -- a2enmod proxy
+	@ lxc-attach $ID -- a2enmod proxy_http
+	@ lxc-attach $ID -- a2enmod proxy_connect
+	@ lxc-attach $ID -- a2enmod proxy_wstunnel
+	# XXX TEST... 
+	@ lxc-attach $ID -- bash -c "\
+		sed -i \
+			-e '/<VirtualHost \*:443>/,/<\/VirtualHost>/ { 
+					/<\/VirtualHost>/ i\    Include /etc/apache2/conf-available/coolwsd.conf
+				}' \
+			/etc/apache2/sites-available/nextcloud.conf"
+	@ lxc-attach $ID -- systemctl restart apache2
+	
 	# nextcloud...
 	@ lxc-attach $ID -- turnkey-occ app:install richdocuments
 	@ lxc-attach $ID -- turnkey-occ config:app:set richdocuments disable_certificate_verification yes
-	# XXX what variable should we use???
 	@ lxc-attach $ID -- turnkey-occ config:app:set richdocuments public_wopi_url "https://${APP_DOMAIN}"
 	@ lxc-attach $ID -- turnkey-occ config:app:set richdocuments wopi_url "https://${APP_DOMAIN}"
-	# XXX do we need this???
+	# XXX do we need to set this differently???
 	@ lxc-attach $ID -- turnkey-occ config:app:set richdocuments types prevent_group_restriction 
 	@ lxc-attach $ID -- turnkey-occ config:app:set richdocuments enabled yes
 fi
 
 echo "# Disabling fail2ban..."
 # NOTE: we do not need this as we'll be running from behind a reverse proxy...
+# XXX revise...
+# 		...can we configure this for reverse proxy, or should it be on 
+# 		the reverse proxy???
 @ lxc-attach $ID systemctl stop fail2ban
 @ lxc-attach $ID systemctl disable fail2ban
 
@@ -199,4 +207,4 @@ echo "# Done."
 
 
 #----------------------------------------------------------------------
-# vim:set ts=4 sw=4 :
+# vim:set ts=4 sw=4 nowrap :