From 18a3d2fb9af4c3327410db71fa01f81648b4e6ec Mon Sep 17 00:00:00 2001 From: Tom Noogen Date: Sat, 19 Aug 2017 09:59:52 -0500 Subject: [PATCH] chore release --- Dockerfile | 6 +-- files/etc/ajenti/vh.json | 46 ------------------- rootfs/etc/ajenti/vh.json | 46 +++++++++++++++++++ .../etc/init.d/disable-transparent-hugepages | 0 {files => rootfs}/etc/init.d/mongod | 0 {files => rootfs}/etc/my_init.d/startup.sh | 14 ++++-- {files => rootfs}/root/bin/my-startup.sh | 0 .../root/phpMyAdmin.config.inc.php | 0 .../var/lib/ajenti/plugins/vh-nginx/nginx.py | 0 .../plugins/vh-nginx/nginx_templates.py | 0 .../ajenti/plugins/vh-php5.6-fpm/php56fpm.py | 0 .../ajenti/plugins/vh-php7.0-fpm/php70fpm.py | 0 .../ajenti/plugins/vh-php7.1-fpm/__init__.py | 0 .../ajenti/plugins/vh-php7.1-fpm/php71fpm.py | 0 .../main-backend-params-php7.1-fcgi.xml | 0 .../var/lib/ajenti/plugins/vh/main.py | 0 16 files changed, 60 insertions(+), 52 deletions(-) delete mode 100644 files/etc/ajenti/vh.json create mode 100644 rootfs/etc/ajenti/vh.json rename {files => rootfs}/etc/init.d/disable-transparent-hugepages (100%) rename {files => rootfs}/etc/init.d/mongod (100%) rename {files => rootfs}/etc/my_init.d/startup.sh (53%) rename {files => rootfs}/root/bin/my-startup.sh (100%) rename {files => rootfs}/root/phpMyAdmin.config.inc.php (100%) rename {files => rootfs}/var/lib/ajenti/plugins/vh-nginx/nginx.py (100%) rename {files => rootfs}/var/lib/ajenti/plugins/vh-nginx/nginx_templates.py (100%) rename {files => rootfs}/var/lib/ajenti/plugins/vh-php5.6-fpm/php56fpm.py (100%) rename {files => rootfs}/var/lib/ajenti/plugins/vh-php7.0-fpm/php70fpm.py (100%) rename {files => rootfs}/var/lib/ajenti/plugins/vh-php7.1-fpm/__init__.py (100%) rename {files => rootfs}/var/lib/ajenti/plugins/vh-php7.1-fpm/php71fpm.py (100%) rename {files => rootfs}/var/lib/ajenti/plugins/vh/layout/main-backend-params-php7.1-fcgi.xml (100%) rename {files => rootfs}/var/lib/ajenti/plugins/vh/main.py (100%) diff --git a/Dockerfile b/Dockerfile index 7426de9..47ee9a6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM niiknow/docker-hostingbase:0.9.1 +FROM niiknow/docker-hostingbase:0.9.2 MAINTAINER friends@niiknow.org @@ -141,11 +141,11 @@ RUN \ && rm -f /var/lib/ajenti/plugins/vh-php5.6-fpm/*.pyc \ && rm -f /var/lib/ajenti/plugins/vh-php7.0-fpm/php*.* \ && rm -f /var/lib/ajenti/plugins/vh-php7.0-fpm/*.pyc \ - && mkdir -p /var/lib/ajenti/plugins/vh-php7.1-fpm \ && rm -f /var/lib/ajenti/plugins/vh/main.* \ && rm -f /var/lib/ajenti/plugins/vh/*.pyc \ && rm -f /var/lib/ajenti/plugins/vh/api.pyc \ && rm -f /var/lib/ajenti/plugins/vh/processes.pyc \ + && mkdir -p /var/lib/ajenti/plugins/vh-php7.1-fpm \ # finish cleaning up && dpkg --configure -a \ @@ -156,7 +156,7 @@ RUN \ && apt-get clean # add files -ADD ./files / +COPY rootfs/. / # update ajenti, install other things RUN \ diff --git a/files/etc/ajenti/vh.json b/files/etc/ajenti/vh.json deleted file mode 100644 index 48bb95a..0000000 --- a/files/etc/ajenti/vh.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "websites": [{ - "custom_conf_toplevel": "", - "name": "phpMyAdmin", - "ssl_cert_path": "", - "maintenance_mode": false, - "ssl_key_path": "", - "locations": [{ - "custom_conf_override": false, - "path_append_pattern": false, - "pattern": "[^/]\\.php(/|$)", - "custom_conf": "", - "path": "", - "match": "regex", - "backend": { - "params": { - "php_admin_values": "open_basedir = none;", - "php_flags": "", - "pm": "dynamic" - }, - "type": "php7.0-fcgi" - } - }], - "owner": "root", - "extensions": { - "ajenti.plugins.vh.processes.ProcessesExtension": { - "processes": [] - }, - "ajenti.plugins.vh-mysql.mysql.MySQLExtension": { - "users": [], - "databases": [] - } - }, - "custom_conf": "", - "domains": [], - "root": "/ajenti/sites/phpMyAdmin", - "ports": [{ - "spdy": false, - "ssl": false, - "host": "*", - "port": 9001, - "default": true - }], - "enabled": true - }] -} \ No newline at end of file diff --git a/rootfs/etc/ajenti/vh.json b/rootfs/etc/ajenti/vh.json new file mode 100644 index 0000000..87a384d --- /dev/null +++ b/rootfs/etc/ajenti/vh.json @@ -0,0 +1,46 @@ +{ + "websites": [{ + "custom_conf_toplevel": "", + "name": "phpMyAdmin", + "ssl_cert_path": "", + "maintenance_mode": false, + "ssl_key_path": "", + "locations": [{ + "custom_conf_override": false, + "path_append_pattern": false, + "pattern": "[^/]\\.php(/|$)", + "custom_conf": "", + "path": "", + "match": "regex", + "backend": { + "params": { + "php_admin_values": "open_basedir = none;", + "php_flags": "", + "pm": "dynamic" + }, + "type": "php7.1-fcgi" + } + }], + "owner": "root", + "extensions": { + "ajenti.plugins.vh.processes.ProcessesExtension": { + "processes": [] + }, + "ajenti.plugins.vh-mysql.mysql.MySQLExtension": { + "users": [], + "databases": [] + } + }, + "custom_conf": "", + "domains": [], + "root": "/ajenti/sites/phpMyAdmin", + "ports": [{ + "spdy": false, + "ssl": false, + "host": "*", + "port": 9001, + "default": true + }], + "enabled": true + }] +} diff --git a/files/etc/init.d/disable-transparent-hugepages b/rootfs/etc/init.d/disable-transparent-hugepages similarity index 100% rename from files/etc/init.d/disable-transparent-hugepages rename to rootfs/etc/init.d/disable-transparent-hugepages diff --git a/files/etc/init.d/mongod b/rootfs/etc/init.d/mongod similarity index 100% rename from files/etc/init.d/mongod rename to rootfs/etc/init.d/mongod diff --git a/files/etc/my_init.d/startup.sh b/rootfs/etc/my_init.d/startup.sh similarity index 53% rename from files/etc/my_init.d/startup.sh rename to rootfs/etc/my_init.d/startup.sh index 6b10e7b..27a643d 100755 --- a/files/etc/my_init.d/startup.sh +++ b/rootfs/etc/my_init.d/startup.sh @@ -16,9 +16,17 @@ if [[ -f /backup/.etc/passwd ]]; then rsync -a /backup/.etc/group /etc/group fi -# start incron after restore -cd /etc/init.d/ -./incron start +# make sure runit services are running across restart +find /etc/service/ -name "down" -exec rm -rf {} \; + +chown www-data:www-data /var/ngx_pagespeed_cache +chmod 750 /var/ngx_pagespeed_cache + +if [ -f /etc/nginx/nginx.new ]; then + mv /etc/nginx/nginx.conf /etc/nginx/nginx.old + mv /etc/nginx/nginx.new /etc/nginx/nginx.conf +fi # starting Vesta +echo "[i] running /root/bin/my-startup.sh" bash /root/bin/my-startup.sh \ No newline at end of file diff --git a/files/root/bin/my-startup.sh b/rootfs/root/bin/my-startup.sh similarity index 100% rename from files/root/bin/my-startup.sh rename to rootfs/root/bin/my-startup.sh diff --git a/files/root/phpMyAdmin.config.inc.php b/rootfs/root/phpMyAdmin.config.inc.php similarity index 100% rename from files/root/phpMyAdmin.config.inc.php rename to rootfs/root/phpMyAdmin.config.inc.php diff --git a/files/var/lib/ajenti/plugins/vh-nginx/nginx.py b/rootfs/var/lib/ajenti/plugins/vh-nginx/nginx.py similarity index 100% rename from files/var/lib/ajenti/plugins/vh-nginx/nginx.py rename to rootfs/var/lib/ajenti/plugins/vh-nginx/nginx.py diff --git a/files/var/lib/ajenti/plugins/vh-nginx/nginx_templates.py b/rootfs/var/lib/ajenti/plugins/vh-nginx/nginx_templates.py similarity index 100% rename from files/var/lib/ajenti/plugins/vh-nginx/nginx_templates.py rename to rootfs/var/lib/ajenti/plugins/vh-nginx/nginx_templates.py diff --git a/files/var/lib/ajenti/plugins/vh-php5.6-fpm/php56fpm.py b/rootfs/var/lib/ajenti/plugins/vh-php5.6-fpm/php56fpm.py similarity index 100% rename from files/var/lib/ajenti/plugins/vh-php5.6-fpm/php56fpm.py rename to rootfs/var/lib/ajenti/plugins/vh-php5.6-fpm/php56fpm.py diff --git a/files/var/lib/ajenti/plugins/vh-php7.0-fpm/php70fpm.py b/rootfs/var/lib/ajenti/plugins/vh-php7.0-fpm/php70fpm.py similarity index 100% rename from files/var/lib/ajenti/plugins/vh-php7.0-fpm/php70fpm.py rename to rootfs/var/lib/ajenti/plugins/vh-php7.0-fpm/php70fpm.py diff --git a/files/var/lib/ajenti/plugins/vh-php7.1-fpm/__init__.py b/rootfs/var/lib/ajenti/plugins/vh-php7.1-fpm/__init__.py similarity index 100% rename from files/var/lib/ajenti/plugins/vh-php7.1-fpm/__init__.py rename to rootfs/var/lib/ajenti/plugins/vh-php7.1-fpm/__init__.py diff --git a/files/var/lib/ajenti/plugins/vh-php7.1-fpm/php71fpm.py b/rootfs/var/lib/ajenti/plugins/vh-php7.1-fpm/php71fpm.py similarity index 100% rename from files/var/lib/ajenti/plugins/vh-php7.1-fpm/php71fpm.py rename to rootfs/var/lib/ajenti/plugins/vh-php7.1-fpm/php71fpm.py diff --git a/files/var/lib/ajenti/plugins/vh/layout/main-backend-params-php7.1-fcgi.xml b/rootfs/var/lib/ajenti/plugins/vh/layout/main-backend-params-php7.1-fcgi.xml similarity index 100% rename from files/var/lib/ajenti/plugins/vh/layout/main-backend-params-php7.1-fcgi.xml rename to rootfs/var/lib/ajenti/plugins/vh/layout/main-backend-params-php7.1-fcgi.xml diff --git a/files/var/lib/ajenti/plugins/vh/main.py b/rootfs/var/lib/ajenti/plugins/vh/main.py similarity index 100% rename from files/var/lib/ajenti/plugins/vh/main.py rename to rootfs/var/lib/ajenti/plugins/vh/main.py