Some fixes

Dockerfile

@@ -1,7 +1,7 @@
 FROM cloudron/base:0.8.1
 MAINTAINER Johannes Zellner <johannes@cloudron.io>
 
-RUN mkdir -p /app/data /app/code /run/wordpress/sessions
+RUN mkdir -p /app/data /app/code /run/app/sessions
 WORKDIR /app/data
 
 # configure apache
@@ -10,18 +10,17 @@ RUN sed -e 's,^ErrorLog.*,ErrorLog "|/bin/cat",' -i /etc/apache2/apache2.conf
 RUN sed -e "s,MaxSpareServers[^:].*,MaxSpareServers 5," -i /etc/apache2/mods-available/mpm_prefork.conf
 
 RUN a2disconf other-vhosts-access-log
-ADD apache2-wordpress.conf /etc/apache2/sites-available/wordpress.conf
-RUN ln -sf /etc/apache2/sites-available/wordpress.conf /etc/apache2/sites-enabled/wordpress.conf
+ADD apache2-app.conf /etc/apache2/sites-available/app.conf
+RUN ln -sf /etc/apache2/sites-available/app.conf /etc/apache2/sites-enabled/app.conf
 RUN echo "Listen 8000" > /etc/apache2/ports.conf
 
 # configure mod_php
 RUN a2enmod php5
 RUN a2enmod rewrite
 RUN sed -e 's/upload_max_filesize = .*/upload_max_filesize = 8M/' \
-        -e 's,;session.save_path.*,session.save_path = "/run/wordpress/sessions",' \
+        -e 's,;session.save_path.*,session.save_path = "/run/app/sessions",' \
         -i /etc/php5/apache2/php.ini
 
-ADD installer.php /app/code/installer.php
 ADD start.sh /app/code/start.sh
 
 CMD [ "/app/code/start.sh" ]

apache2-wordpress.conf → apache2-app.conf

@@ -15,7 +15,7 @@
 
     </Directory>
 
-    # some directories must be protected
+    # some directories must be protected for wordpress this is not good for the generic app
    <Directory /app/data/wp-content>
         DirectoryIndex Off
         AllowOverride None

start.sh

@@ -3,7 +3,7 @@
 set -eu
 
 mkdir -p /app/data
-chown -R www-data:www-data /app/data /run/wordpress
+chown -R www-data:www-data /app/data /run/app
 
 echo "Starting apache"
 APACHE_CONFDIR="" source /etc/apache2/envvars