Refactor configurations

Signed-off-by: Mriyam Tamuli <[email protected]>

Author: mbtamuli

.gitignore

@@ -1,4 +1,7 @@
-wordpress
-data
+app
 logs
-test
+test*
+codeception.yml
+composer.json
+logo.jpg
+vendor

multiple-sites/.env.deployer config/.env.deployer

@@ -3,5 +3,5 @@ MYSQL_DATABASE=wordpress
 MYSQL_USER=wordpress
 MYSQL_PASSWORD=password
 
-WORDPRESS_DB_USER=wordpress
-WORDPRESS_DB_PASSWORD=password
+WORDPRESS_DB_HOST=db
+VIRTUAL_HOST=site1.test

multiple-sites/.env.example config/.env.example

@@ -11,7 +11,7 @@ server {
 		rewrite /wp-admin$ $scheme://$host$uri/ permanent;
 		rewrite ^(/[^/]+)?(/wp-.*) $2 last;
 		rewrite ^(/[^/]+)?(/.*\.php) $2 last;
-	}
+  }
 
 	location / {
 		try_files $uri $uri/ /index.php?$args;
@@ -24,6 +24,13 @@ server {
 		fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
 	}
 
+	location = /robots.txt {
+		return 200 'User-agent: *
+Disallow: /';
+		access_log off;
+		log_not_found off;
+	}
+
 	client_max_body_size 100m;
-	include includes/wpsubdir.conf;
+	include /etc/nginx/sites-enabled/*;
 }

wp-multisite/config/nginx/default.conf config/nginx/default.conf

@@ -6,16 +6,16 @@ services:
     restart: always
     command: ["-invite-jim=false"]
     environment:
-      - VIRTUAL_HOST=mail.site1.test
+      - VIRTUAL_HOST=mail.${VIRTUAL_HOST}
       - VIRTUAL_PORT=8025
     networks:
      - site-network
 
-  mysql:
+  db:
     image: mysql:latest
     restart: always
     volumes:
-      - "./data/db:/var/lib/mysql"
+      - "./app/db:/var/lib/mysql"
     environment:
       - MYSQL_ROOT_PASSWORD
       - MYSQL_DATABASE
@@ -27,14 +27,15 @@ services:
   php:
     image: rtcamp/wordpress
     depends_on:
-      - mysql
+      - db
     restart: always
     volumes:
-      - "./wordpress:/var/www/html"
+      - "./app/src:/var/www/html"
       - "./config/php-fpm/php.ini:/usr/local/etc/php/php.ini"
     environment:
-      - WORDPRESS_DB_USER
-      - WORDPRESS_DB_PASSWORD
+      - WORDPRESS_DB_HOST
+      - WORDPRESS_DB_USER=${MYSQL_USER}
+      - WORDPRESS_DB_PASSWORD=${MYSQL_PASSWORD}
     networks:
      - site-network
 
@@ -44,9 +45,9 @@ services:
       - php
     restart: always
     environment:
-      - VIRTUAL_HOST=site1.test
+      - VIRTUAL_HOST
     volumes:
-      - "./wordpress:/var/www/html"
+      - "./app/src:/var/www/html"
       - "./config/nginx/default.conf:/etc/nginx/conf.d/default.conf"
       - "./logs/nginx:/var/log/nginx"
     networks:
@@ -55,4 +56,4 @@ services:
 networks:
   site-network:
     external:
-      name: custom-network
+      name: ${VIRTUAL_HOST}