fix: place commands in if blocks

Makefile

@@ -73,9 +73,10 @@ install:  ## Install files into rpm dest (requires env var DESTDIR)
 		printf "[CRITICAL] Missing env var DESTDIR\n[CRITICAL] This command is designed to be called by rpmbuild only!\n" 1>&2; \
 		exit 1; \
 	fi
-	install --mode=755 --directory $(DESTDIR)$(RPM_SYSCONFDIR)/nginx/conf.d $(DESTDIR)$(RPM_SYSCONFDIR)/nextcloud
+	install --mode=755 --directory $(DESTDIR)$(RPM_SYSCONFDIR)/nginx/conf.d $(DESTDIR)$(RPM_SYSCONFDIR)/nextcloud $(DESTDIR)$(RPM_SYSCONFDIR)/php-fpm.d
 	install --mode=644 --target-directory=$(DESTDIR)$(RPM_SYSCONFDIR)/nginx/conf.d files/nginx/cloud.netoik.io.conf
-	install --mode=640 --target-directory=$(DESTDIR)$(RPM_SYSCONFDIR)/nextcloud files/nextcloud/config.php
+	install --mode=640 --target-directory=$(DESTDIR)$(RPM_SYSCONFDIR)/nextcloud files/nextcloud/config.php.tpl
+	install --mode=644 --target-directory=$(DESTDIR)$(RPM_SYSCONFDIR)/php-fpm.d files/php-fpm/nextcloud.conf
 
 .PHONY: upload
 upload:  ## Upload rpm package to Gitea repository (requires env var PKG_TOKEN)

files/nextcloud/config.php.tpl

@@ -1,8 +1,8 @@
 <?php
 $CONFIG = array (
-  'instanceid' => '',
-  'passwordsalt' => '',
-  'secret' => '',
+  'instanceid' => '$INSTANCE_ID',
+  'passwordsalt' => '$PASSWORD_SALT',
+  'secret' => '$SECRET',
   'trusted_domains' => array (
     0 => 'cloud.netoik.io',
   ),
@@ -26,7 +26,6 @@ $CONFIG = array (
   ),
   'default_phone_region' => 'FR',
   'maintenance' => false,
-  'maintenance_window_start' => 1,
   'log_type' => 'systemd',
   'loglevel' => 2,
   'config_is_read_only' => true,

files/php-fpm/nextcloud.conf

@@ -0,0 +1,16 @@
+; Configure here a php-fpm pool
+; See manual at: https://www.php.net/manual/en/install.fpm.configuration.php
+
+[nextcloud]
+user = nextcloud
+group = nextcloud
+
+listen = /run/php-fpm/nextcloud.sock
+listen.owner = nextcloud
+listen.group = nextcloud
+listen.mode = 0777
+
+pm = dynamic
+pm.max_children = 50
+pm.min_spare_servers = 5
+pm.max_spare_servers = 35

netoik-cloud.spec

@@ -10,7 +10,7 @@ URL:            %(make url)
 Source0:        %(make source0)
 Buildarch:      %(make arch)
 BuildRequires:  make
-Requires:       netoik-rp netoik-db netoik-cache php php-cli php-gd php-mbstring php-intl php-pecl-apcu php-mysqlnd php-opcache php-json php-zip php-redis php-imagick php-fpm
+Requires:       netoik-rp netoik-db netoik-cache php php-cli php-gd php-mbstring php-intl php-pecl-apcu php-mysqlnd php-opcache php-json php-zip php-redis php-imagick php-fpm php-posix php-pgsql
 
 %description
 Install the cloud server called Nextcloud.
@@ -27,29 +27,22 @@ set -xe
 
 # Create nextcloud user
 if ! id nextcloud >/dev/null 2>&1; then
-  useradd --no-create-home --shell $SHELL --system nextcloud
+  useradd --base-dir %{_sharedstatedir} --create-home --shell $SHELL --system nextcloud
+  runuser --user=nextcloud -- mkdir --parents %{_sharedstatedir}/nextcloud/data
+  runuser --user=nextcloud -- printf 'alias occ="php /var/www/nextcloud/occ"\n' >  %{_sharedstatedir}/nextcloud/.bash_profile
+  usermod --groups postgres,valkey --append nextcloud
 fi
 
-# Add nextcloud to postgres and valkey groups
-usermod --groups postgres,valkey --user nextcloud
-
-# Download nextcloud latest release
-wget --output-document %{_tmppath}/nextcloud-latest.tar.bz2 https://download.nextcloud.com/server/releases/latest.tar.bz2
-wget --output-document %{_tmppath}/nextcloud-latest.tar.bz2.asc https://download.nextcloud.com/server/releases/latest.tar.bz2.asc
-wget --output-document %{_tmppath}/nextcloud.asc https://nextcloud.com/nextcloud.asc
-gpg --import %{_tmppath}/nextcloud.asc
-gpg --verify %{_tmppath}/nextcloud-latest.tar.bz2.asc %{_tmppath}/nextcloud-latest.tar.bz2
-tar --extract --file=%{_tmppath}/nextcloud-latest.tar.bz2 --directory=%{_sharedstatedir}
-
-# Change rights an owner
-chown nextcloud:nextcloud %{_sharedstatedir}/nextcloud
-chmod 700 %{_sharedstatedir}/nextcloud
-
-# Create data dir
-runuser --user=nextcloud -- mkdir %{_sharedstatedir}/nextcloud/data
-
-# Add link to config
-runuser --user=nextcloud -- ln --symbolic --force %{_sysconfdir}/nextcloud/config.php %{_sharedstatedir}/nextcloud/config/config.php
+# Create config file
+if ! -f %{_sysconfdir}/nextcloud/config.php; then
+  export INSTANCE_ID=$(openssl rand -hex 16)
+  export PASSWORD_SALT=$(openssl rand -hex 16)
+  export SECRET=$(openssl rand -hex 16)
+  export CONFIG='$CONFIG'
+  envsubst < %{_sysconfdir}/nextcloud/config.php.tpl > %{_sysconfdir}/nextcloud/config.php
+	chown root:nextcloud %{_sysconfdir}/nextcloud/config.php
+	chmod 640 %{_sysconfdir}/nextcloud/config.php
+fi
 
 # Create postgres user and db
 if ! runuser --user=postgres -- psql --quiet --tuples-only --command='\du' | grep --quiet nextcloud; then
@@ -59,21 +52,31 @@ if ! runuser --user=postgres -- psql --quiet --tuples-only --command='\l' | grep
   runuser --user=postgres -- createdb --owner=nextcloud nextcloud
 fi
 
+# Download nextcloud latest release
+if ! -d /var/www/nextcloud; then
+  wget --output-document %{_tmppath}/nextcloud-latest.tar.bz2 https://download.nextcloud.com/server/releases/latest.tar.bz2
+  wget --output-document %{_tmppath}/nextcloud-latest.tar.bz2.asc https://download.nextcloud.com/server/releases/latest.tar.bz2.asc
+  wget --output-document %{_tmppath}/nextcloud.asc https://nextcloud.com/nextcloud.asc
+  gpg --import %{_tmppath}/nextcloud.asc
+  gpg --verify %{_tmppath}/nextcloud-latest.tar.bz2.asc %{_tmppath}/nextcloud-latest.tar.bz2
+  tar --extract --file=%{_tmppath}/nextcloud-latest.tar.bz2 --directory=/var/www
+  chown --recursive nextcloud:nextcloud /var/www/nextcloud
+  chmod 755 /var/www/nextcloud
+  runuser --user=nextcloud -- ln --symbolic --force %{_sysconfdir}/nextcloud/config.php /var/www/nextcloud/config/config.php
+fi
+
 # Restart services
 systemctl daemon-reload
 systemctl reenable nginx.service php-fpm.service
 systemctl restart nginx.service php-fpm.service
 
-%postun
+%preun
 # Display commands and exit on error
 set -xe
 
-# Stop service
-systemctl stop php-fpm
-
 # If uninstalling, then delete user and db
 if [ $1 == 0 ]; then
-  if id nextcloud; then
+  if id nextcloud >/dev/null 2>&1; then
     userdel --force --remove nextcloud
   fi
   if runuser --user=postgres -- psql --quiet --tuples-only --command='\l' | grep --quiet nextcloud; then
@@ -82,13 +85,17 @@ if [ $1 == 0 ]; then
   if runuser --user=postgres -- psql --quiet --tuples-only --command='\du' | grep --quiet nextcloud; then
     runuser --user=postgres -- dropuser nextcloud
   fi
+  rm --force /etc/nextcloud/config.php
+  rm --recursive --force /var/www/nextcloud
 fi
 
 %files
 %dir %attr(755, root, root) %{_sysconfdir}/nextcloud
-%attr(640, root, -) %{_sysconfdir}/nextcloud/config.php
+%attr(644, root, root) %{_sysconfdir}/nextcloud/config.php.tpl
 
 %attr(644, root, root) %{_sysconfdir}/nginx/conf.d/cloud.netoik.io.conf
 
+%attr(644, root, root) %{_sysconfdir}/php-fpm.d/nextcloud.conf
+
 %changelog
 %autochangelog