From fde215affca8265722059fd81e21884d69001975 Mon Sep 17 00:00:00 2001
From: Andrey Arapov <andrey.arapov@nixaid.com>
Date: Sun, 17 May 2020 21:39:20 +0200
Subject: [PATCH] refactor

---
 Dockerfile                                    |  3 +-
 README.md                                     |  6 +-
 .../nginx/conf.d/rainloop.conf                |  0
 etc/php7/conf.d/00-privatebin.ini             | 64 +++++++++++++++++++
 etc/php7/php-fpm.d/zz-rainloop.conf           | 18 ++++++
 php-fpm.conf                                  | 15 -----
 6 files changed, 86 insertions(+), 20 deletions(-)
 rename rainloop.conf => etc/nginx/conf.d/rainloop.conf (100%)
 create mode 100644 etc/php7/conf.d/00-privatebin.ini
 create mode 100644 etc/php7/php-fpm.d/zz-rainloop.conf
 delete mode 100644 php-fpm.conf

diff --git a/Dockerfile b/Dockerfile
index 21d3c39..3b07c97 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -35,8 +35,7 @@ RUN wget --progress=bar:force:noscroll -O $RLFILE https://github.com/RainLoop/ra
     rm -rf "$GNUPGHOME" $RLFILE
 
 # Copy the php-fpm & nginx configs
-COPY php-fpm.conf /etc/php7/php-fpm.conf
-COPY rainloop.conf /etc/nginx/conf.d/rainloop.conf
+COPY etc/ /etc/
 
 USER $USER
 CMD php-fpm7 -F
diff --git a/README.md b/README.md
index 5568db5..1611c24 100644
--- a/README.md
+++ b/README.md
@@ -71,7 +71,7 @@ docker-compose up -d
 
 ```
 cd /srv/data
-cp -pvi rainloop-1.13.0-bkp/html/data/_data_/_default_/configs/application.ini rainloop/html/data/_data_/_default_/configs/
-cp -pvi rainloop-1.13.0-bkp/html/data/_data_/_default_/domains/yourdomain.com.ini rainloop/html/data/_data_/_default_/domains/
-chown --reference rainloop/html/data/_data_ rainloop/html/data/_data_/_default_/configs/application.ini rainloop/html/data/_data_/_default_/domains/yourdomain.com.ini
+
+rsync -avHx --progress rainloop-1.13.0-bkp/html/data/_data_ rainloop/html/data/
+chown -Rh --reference rainloop/html/data rainloop/html/data/_data_
 ```
diff --git a/rainloop.conf b/etc/nginx/conf.d/rainloop.conf
similarity index 100%
rename from rainloop.conf
rename to etc/nginx/conf.d/rainloop.conf
diff --git a/etc/php7/conf.d/00-privatebin.ini b/etc/php7/conf.d/00-privatebin.ini
new file mode 100644
index 0000000..a245125
--- /dev/null
+++ b/etc/php7/conf.d/00-privatebin.ini
@@ -0,0 +1,64 @@
+; session.use_strict_mode specifies whether the module will use strict session id mode. If this
+; mode is enabled, the module does not accept uninitialized session ID. If uninitialized session ID
+; is sent from browser, new session ID is sent to browser. Applications are protected from session
+; fixation via session adoption with strict mode. Defaults to 0 (disabled).
+session.use_strict_mode=On
+
+; Enable assert() evaluation.
+assert.active=Off
+
+; This determines whether errors should be printed to the screen as part of the output or if they
+; should be hidden from the user. Value "stderr" sends the errors to stderr instead of stdout.
+display_errors=Off
+
+; Tells whether script error messages should be logged to the server's error log or error_log.
+; You're strongly advised to use error logging in place of error displaying on production web sites.
+log_errors=On
+
+
+
+; increase size limits
+upload_max_filesize=90M
+post_max_size=90M
+
+
+
+; best practices
+
+; Disable deprecated short open tags ("<?")
+short_open_tag=Off
+
+; Do not expose php version header
+expose_php=Off
+
+; -1 can be used (like E_ALL) to report all errors - including those coming in new php versions
+error_reporting=-1
+
+
+
+; performance
+
+; we want fast cli scripts too
+opcache.enable_cli=On
+
+; fast shutdown because we skip free() calls
+opcache.fast_shutdown=On
+
+; The amount of memory used to store interned strings, in megabytes
+opcache.interned_strings_buffer=8
+
+; The maximum number of keys (and therefore scripts) in the OPcache hash table
+opcache.max_accelerated_files=20000
+
+; The size of the shared memory storage used by OPcache, in megabytes
+opcache.memory_consumption=128
+
+; If enabled, OPcache will check for updated scripts every opcache.revalidate_freq seconds. When
+; this directive is disabled, you must reset OPcache manually via opcache_reset(),
+; opcache_invalidate() or by restarting the Web server for changes to the filesystem to take effect.
+opcache.validate_timestamps=Off
+
+; Determines the size of the realpath cache to be used by PHP. This value
+; should be increased on systems where PHP opens many files, to reflect the
+; quantity of the file operations performed.
+realpath_cache_size=4096K
diff --git a/etc/php7/php-fpm.d/zz-rainloop.conf b/etc/php7/php-fpm.d/zz-rainloop.conf
new file mode 100644
index 0000000..256b866
--- /dev/null
+++ b/etc/php7/php-fpm.d/zz-rainloop.conf
@@ -0,0 +1,18 @@
+[global]
+daemonize = no
+error_log = /dev/stderr
+
+[www]
+user = user
+group = user
+listen = 0.0.0.0:9000
+pm = dynamic
+pm.max_children = 5
+pm.start_servers = 2
+pm.min_spare_servers = 1
+pm.max_spare_servers = 3
+clear_env = On
+;access.log = /dev/null
+;php_admin_value[upload_max_filesize] = 90M
+;php_admin_value[post_max_size] = 90M
+;php_admin_value[output_buffering] = 0
diff --git a/php-fpm.conf b/php-fpm.conf
deleted file mode 100644
index f498fe0..0000000
--- a/php-fpm.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-[global]
-error_log = /var/log/php-fpm.log
-
-[www]
-user = user
-group = user
-listen = 0.0.0.0:9000
-pm = dynamic
-pm.max_children = 5
-pm.start_servers = 2
-pm.min_spare_servers = 1
-pm.max_spare_servers = 3
-php_admin_value[upload_max_filesize] = 80M
-php_admin_value[post_max_size] = 90M
-php_admin_value[output_buffering] = 0