chore release

Dockerfile

@@ -1,4 +1,4 @@
-FROM niiknow/docker-hostingbase:0.9.1
+FROM niiknow/docker-hostingbase:0.9.2
 
 MAINTAINER [email protected]
 
@@ -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 \

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
+  }]
+}

files/etc/my_init.d/startup.sh → 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