.pct-helpers

@@ -1021,10 +1021,6 @@ showNotes(){
 		&& ( cat "${BUILD_NOTES}".tpl \
 			| expandPCTTemplate $@ \
 			| tee "${BUILD_NOTES}" )
-	[ -e ./POST_INSTALL.md ] \
-		&& echo "####" \
-		&& cat ./POST_INSTALL.md \
-			| sed 's/^/## /'
 }
 
 #

nextcloud/POST_INSTALL.md

@@ -1,14 +0,0 @@
-
-
-## Post install steps:
-
-- Open Administration settings -> Office -- this will initialize the office;  
-  To check see if the /Templates directory is populated.
-- Update Nextcoud to the latest version via Administration settings, this 
-  can take more than one run
-- Apply the recommended in Administration settings `occ` commands, usually:
-  - `turnkey-occ maintenance:repair --include-expansive`
-  - `turnkey-occ db:add-missing-indices`
-
-
-

nextcloud/make.sh

@@ -44,9 +44,7 @@ REBOOT=${REBOOT:=1}
 
 # XXX should we ask??
 COLLABORA_OFFICE=${COLLABORA_OFFICE:=1}
-
+NEXTCLOUD_UPGRADE=${NEXTCLOUD_UPGRADE:=1}
-# XXX not yet figured out how to do this from CLI...
-#NEXTCLOUD_UPGRADE=${NEXTCLOUD_UPGRADE:=1}
 
 readVars
 
@@ -122,13 +120,12 @@ done
 		/var/www/nextcloud/config/config.php"
 
 # set opcache.interned_strings_buffer...
-PHP_VERSION=$(\
+PHP_VERSION=$(lxc-attach $ID -- php --version \
-	lxc-attach $ID -- php --version \
+	| sed -ne 's/^PHP \([0-9]\+\.[0-9]\+\).*/\1/p')
-		| sed -ne 's/^PHP \([0-9]\+\.[0-9]\+\).*/\1/p')
 @ lxc-attach $ID -- bash -c "\
 	sed -i \
 		-e '/opcache.interned_strings_buffer/ a opcache.interned_strings_buffer=32' \
-		/etc/php/${PHP_VERSION}/apache2/php.ini"
+		/etc/php/${PHP_VERSION}/cli/php.ini"
 
 # remove /index.php from urls...
 # for more info see:
@@ -153,10 +150,11 @@ pctPushAssets $ID
 # Colabora...
 if ! [ -z $COLLABORA_OFFICE ] ; then
 	echo "# Collabora office..."
-	# see:
-	# 	https://sdk.collaboraonline.com/docs/installation/Configuration.html
 
 	# coolwsd...
+	# XXX still need to make this work through a reverse proxy...
+	# see:
+	# 	https://sdk.collaboraonline.com/docs/installation/Configuration.html
 	@ lxc-attach $ID -- bash -c "\
 		cd /usr/share/keyrings \
 			&& wget https://collaboraoffice.com/downloads/gpg/collaboraonline-release-keyring.gpg"
@@ -164,17 +162,19 @@ if ! [ -z $COLLABORA_OFFICE ] ; then
 		apt update \
 			&& apt install -y coolwsd code-brand"
 	# XXX should these be set in here or as args in the coolwsd.service ???
-	# ssl>enable -> false
+	# /etc/coolwsd/coolwsd.xml
+	# XXX add groups...
+	# 	ssl>enable -> false
 	@ lxc-attach $ID -- bash -c "\
 		sed -i \
 			'/<ssl /,+5{ s/\(<enable [^>]*>\)true\(<\/enable>\)/\1false\2/ }' \
 			/etc/coolwsd/coolwsd.xml"
-	# ssl>termination -> true
+	# 	ssl>termination -> true
 	@ lxc-attach $ID -- bash -c "\
 		sed -i \
 			'/<ssl /,+5{ s/\(<termination [^>]*>\)false\(<\/termination>\)/\1true\2/ }' \
 			/etc/coolwsd/coolwsd.xml"
-	# alias_groups -- allow access both from $APP_PASS and from LAN...
+	# alias_groups...
 	@ lxc-attach $ID -- bash -c "\
 		sed -i \
 			-e '/<alias_groups .* mode=\"first\"/ s/mode=\"first\"/mode=\"groups\"/ ' \