Merge remote-tracking branch 'origin/develop'

README.md

@@ -7,7 +7,7 @@ Install libre.sh
 Install a proxy module on libre.sh like Haproxy
 
 ```
-libre provision -a lab.libreho.st/libre.sh/compose/wordpress -u yourdomain.com -s
+libre provision -a wordpress -u yourdomain.com -s
 ```
 
 You can now access yourdomain.com.
@@ -17,6 +17,8 @@ You can now access yourdomain.com.
 
 Once started, you'll arrive at the configuration wizzard.
 
+Sending email is supported using the variables from libre.sh on the system
+
 ## Backup
 
 In order to backup, just run the `./BACKUP` script. And copy all the data to a safe place.

docker-compose.yml

@@ -15,16 +15,18 @@ services:
     - ./db/mysql/runtime:/var/lib/mysql
     environment:
     - MYSQL_ROOT_PASSWORD
+    - MYSQL_DATABASE=wordpress
     networks:
     - back
   app:
-    image: wordpress:${WORDPRESS_VERSION:-latest}
+    image: libresh/wordpress:${WORDPRESS_VERSION:-latest}
     links:
     - db:mysql
     volumes:
     - ./data/wp-content:/var/www/html/wp-content
     environment:
     - WORDPRESS_DB_PASSWORD
+    - WORDPRESS_DB_USER=root
     - MAIL_PASS
     - MAIL_USER
     - MAIL_HOST

scripts/install

@@ -3,7 +3,7 @@
 source /etc/environment
 
 
-WORDPRESS_VERSION=5-fpm
+WORDPRESS_VERSION=5.8-fpm
 MYSQL_ROOT_PASSWORD=`tr -dc A-Za-z0-9_ < /dev/urandom | head -c 20 | xargs`
 
 var=$(for folder in `ls /data/domains`; do cat /data/domains/$folder/.env | grep SUBNET | cut -d"=" -f2; done | sort | tail -n1)
@@ -15,7 +15,7 @@ echo "MAIL_PASS=${MAIL_PASS}" >> .env
 echo "MAIL_USER=${MAIL_USER}" >> .env
 echo "MAIL_HOST=${MAIL_HOST}" >> .env
 echo "MAIL_PORT=${MAIL_PORT}" >> .env
-echo "MAIL_SECURITY=tls" >> .env
+echo "MAIL_SECURITY=${MAIL_SECURITY}" >> .env
 echo "SUBNET=${SUBNET}" >> .env
 echo "WORDPRESS_VERSION=${WORDPRESS_VERSION}" >> .env
 echo "MYSQL_VERSION=5.7" >> .env