From b07c8ef801dd20ad67eccb5127d2c322bf86c0b0 Mon Sep 17 00:00:00 2001
From: Modulos <modulos@protonmail.com>
Date: Mon, 1 May 2017 18:24:41 +0200
Subject: [PATCH] Add fpm config finalize setup via occ

---
 files/fpm.conf | 26 ++++++++++++++++++++++++++
 gencode-remote | 10 +++++++---
 manifest       |  4 ++++
 3 files changed, 37 insertions(+), 3 deletions(-)
 create mode 100644 files/fpm.conf

diff --git a/files/fpm.conf b/files/fpm.conf
new file mode 100644
index 0000000..776f2c6
--- /dev/null
+++ b/files/fpm.conf
@@ -0,0 +1,26 @@
+[www]
+
+user = www-data
+group = www-data
+
+listen = /run/php/php7.0-fpm.sock
+
+listen.owner = www-data
+listen.group = www-data
+
+; Choose how process manager will control the number of child processes.
+pm = dynamic
+
+pm.max_children = 5
+
+pm.start_servers = 2
+pm.min_spare_servers = 1
+pm.max_spare_servers = 3
+
+env[HOSTNAME] = $HOSTNAME
+env[PATH] = /usr/local/bin:/usr/bin:/bin
+env[TMP] = /tmp
+env[TMPDIR] = /tmp
+env[TEMP] = /tmp
+
+security.limit_extensions = .php
diff --git a/gencode-remote b/gencode-remote
index 94bd17a..aff26ad 100755
--- a/gencode-remote
+++ b/gencode-remote
@@ -25,8 +25,12 @@ admin_user=$(cat "$__object/parameter/admin-user")
 admin_pass=$(cat "$__object/parameter/admin-pass")
 # TODO check shasum of tar ball 
 cat <<eof
-curl -s -L ${nextcloud_uri} -o /tmp/nextcloud.tar.bz2 && 
-tar -C /var/www -xvjf /tmp/nextcloud.tar.bz2 && 
-rm -f /tmp/nextcloud.tar.bz2 && 
+curl -s -L ${nextcloud_uri} -o /tmp/nextcloud.tar.bz2 
+tar -C /var/www -xvjf /tmp/nextcloud.tar.bz2 
+rm -f /tmp/nextcloud.tar.bz2 
 chown -R www-data:www-data /var/www/nextcloud 
+cd /var/www/nextcloud
+sudo -u www-data php occ maintenance:install --database \
+"pgsql" --database-name "$db_name"  --database-user "$db_user" --database-pass \
+"$db_pass" --admin-user "$admin_user" --admin-pass "$admin_pass"
 eof
diff --git a/manifest b/manifest
index 21b45f6..427eb90 100755
--- a/manifest
+++ b/manifest
@@ -61,6 +61,10 @@ require="__apt_key_uri/dotdeb" __apt_source dotdeb --uri http://packages.dotdeb.
 
 require="__apt_source/dotdeb" __apt_update_index
 
+require="__package/php7.0-fpm" __file /etc/php/7.0/fpm/pool.d/www.conf \
+    --owner root --group root --mode 644 --source "$__type/files/fpm.conf"
+
+
 
 ## Nginx
 require="__package/nginx" __file /etc/nginx/sites-enabled/nextcloud --owner www-data \