Fix permissions issues when using bind mounts (#191)

* Create a link to /var/www/html only when /var/www/${APP_PATH} does not exist

* Fix permissions when taking into account the usage of env APP_PATH

* Adapt virtual server config file inside /etc/apache2/sites-available

* Fix port substitution in /etc/apache2/sites-available/000-default.conf

* Add instructions when using bind mounts

---------

Co-authored-by: Robin Alexander <colisee@hotmail>

Author: colisee

RUN.md

@@ -41,6 +41,16 @@ For instance:
 
 * favicon: `/var/www/html/Web/favicon.ico`
 
+## Bind mounts
+
+If you are using bind mounts for librebooking, then you need to grant
+the required permissions before running the librebooking container
+
+```sh
+sudo mkdir --parents <bind_dir_path>
+sudo chown go+rwx <bind_dir_path>
+```
+
 ## Backround jobs
 
 Several services in librebooking such as reminder emails require a job

bin/entrypoint.sh

@@ -108,13 +108,15 @@ fi
 if [ -n "${APP_PATH}" ]; then
   ## Set server document root 1 directory up
   sed \
-    -i /etc/apache2/sites-enabled/000-default.conf \
+    -i /etc/apache2/sites-available/000-default.conf \
     -e "s:/var/www/html:/var/www:"
 
   ## Create a link to the html directory
-  pushd /var/www
-  ln -s html "${APP_PATH}"
-  popd
+  if ! [ -e "/var/www/${APP_PATH}" ]; then
+    pushd /var/www
+    ln -s html "${APP_PATH}"
+    popd
+  fi
 
   ## Adapt the .htaccess file
   sed \

setup.sh

@@ -47,7 +47,7 @@ sed \
   -e 's/Listen 443/Listen 8443/'
 sed \
   -i /etc/apache2/sites-available/000-default.conf \
-  -e 's/<VirtualHost *:80>/<VirtualHost *:8080>/'
+  -e 's/<VirtualHost \*:80>/<VirtualHost \*:8080>/'
 
 if [ -f /var/www/html/composer.json ]; then
   sed \
@@ -65,17 +65,15 @@ if ! [ -d /var/www/html/tpl_c ]; then
 fi
 mkdir /var/www/html/Web/uploads/reservation
 
-chown --recursive www-data:root \
-  /var/www/html/config \
-  /var/www/html/plugins \
-  /var/www/html/tpl_c \
-  /var/www/html/Web/uploads/images \
-  /var/www/html/Web/uploads/reservation \
+chown www-data:root \
+  /var/www \
   /usr/local/etc/php/conf.d/librebooking.ini
-chmod --recursive g+rwx \
-  /var/www/html/config \
-  /var/www/html/plugins \
-  /var/www/html/tpl_c \
-  /var/www/html/Web/uploads/images \
-  /var/www/html/Web/uploads/reservation \
+chmod g+rwx \
+  /var/www \
   /usr/local/etc/php/conf.d/librebooking.ini
+chown --recursive www-data:root \
+  /etc/apache2/sites-available \
+  /var/www/html/tpl_c
+chmod --recursive g+rwx \
+  /etc/apache2/sites-available \
+  /var/www/html/tpl_c