This repository was archived by the owner on Aug 10, 2020. It is now read-only.

Commit aacd7e1

authored

Merge pull request #22 from mbtamuli/refactor

Refactor configurations

2 parents 2ef4505 + d47c4a5 commit aacd7e1Copy full SHA for aacd7e1

File tree

17 files changed

+28

-381

lines changed

.gitignore
config
- .env.deployer
- .env.example
- nginx
  - default.conf
- php-fpm
  - php.ini
docker-compose.yml
multiple-sites
- README.md
- config/nginx
  - default.conf
- setup.sh
single-site
- README.md
- config
  - nginx
    - default.conf
  - php-fpm
    - php.ini
- docker-compose.yml
wp-multisite
- README.md
- config
  - nginx/includes
    - wpsubdir.conf
  - php-fpm
    - php.ini
- docker-compose.yml

17 files changed

+28

-381

lines changed

`‎.gitignore‎`

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,7 @@`
`1`		`-wordpress`
`2`		`-data`
	`1`	`+app`
`3`	`2`	`logs`
`4`		`-test`
	`3`	`+test*`
	`4`	`+codeception.yml`
	`5`	`+composer.json`
	`6`	`+logo.jpg`
	`7`	`+vendor`

`‎multiple-sites/.env.deployer‎ renamed to ‎config/.env.deployer‎`

File renamed without changes.

`‎multiple-sites/.env.example‎ renamed to ‎config/.env.example‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,5 @@ MYSQL_DATABASE=wordpress`
`3`	`3`	`MYSQL_USER=wordpress`
`4`	`4`	`MYSQL_PASSWORD=password`
`5`	`5`
`6`		`-WORDPRESS_DB_USER=wordpress`
`7`		`-WORDPRESS_DB_PASSWORD=password`
	`6`	`+WORDPRESS_DB_HOST=db`
	`7`	`+VIRTUAL_HOST=site1.test`

`‎wp-multisite/config/nginx/default.conf‎ renamed to ‎config/nginx/default.conf‎`

Lines changed: 9 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ server {`
`11`	`11`	`rewrite /wp-admin$ $scheme://$host$uri/ permanent;`
`12`	`12`	`rewrite ^(/[^/]+)?(/wp-.*) 2ドル last;`
`13`	`13`	`rewrite ^(/[^/]+)?(/.*\.php) 2ドル last;`
`14`		`-}`
	`14`	`+}`
`15`	`15`
`16`	`16`	`location / {`
`17`	`17`	`try_files $uri $uri/ /index.php?$args;`
`@@ -24,6 +24,13 @@ server {`
`24`	`24`	`fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;`
`25`	`25`	`}`
`26`	`26`
	`27`	`+ location = /robots.txt {`
	`28`	`+ return 200 'User-agent: *`
	`29`	`+Disallow: /';`
	`30`	`+ access_log off;`
	`31`	`+ log_not_found off;`
	`32`	`+ }`
	`33`	`+`
`27`	`34`	`client_max_body_size 100m;`
`28`		`- include includes/wpsubdir.conf;`
	`35`	`+ include /etc/nginx/sites-enabled/*;`
`29`	`36`	`}`

`‎multiple-sites/config/php-fpm/php.ini‎ renamed to ‎config/php-fpm/php.ini‎`

File renamed without changes.

`‎multiple-sites/docker-compose.yml‎ renamed to ‎docker-compose.yml‎`

Lines changed: 11 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,16 +6,16 @@ services:`
`6`	`6`	`restart: always`
`7`	`7`	`command: ["-invite-jim=false"]`
`8`	`8`	`environment:`
`9`		`- - VIRTUAL_HOST=mail.site1.test`
	`9`	`+ - VIRTUAL_HOST=mail.${VIRTUAL_HOST}`
`10`	`10`	`- VIRTUAL_PORT=8025`
`11`	`11`	`networks:`
`12`	`12`	`- site-network`
`13`	`13`
`14`		`- mysql:`
	`14`	`+ db:`
`15`	`15`	`image: mysql:latest`
`16`	`16`	`restart: always`
`17`	`17`	`volumes:`
`18`		`- - "./data/db:/var/lib/mysql"`
	`18`	`+ - "./app/db:/var/lib/mysql"`
`19`	`19`	`environment:`
`20`	`20`	`- MYSQL_ROOT_PASSWORD`
`21`	`21`	`- MYSQL_DATABASE`
`@@ -27,14 +27,15 @@ services:`
`27`	`27`	`php:`
`28`	`28`	`image: rtcamp/wordpress`
`29`	`29`	`depends_on:`
`30`		`- - mysql`
	`30`	`+ - db`
`31`	`31`	`restart: always`
`32`	`32`	`volumes:`
`33`		`- - "./wordpress:/var/www/html"`
	`33`	`+ - "./app/src:/var/www/html"`
`34`	`34`	`- "./config/php-fpm/php.ini:/usr/local/etc/php/php.ini"`
`35`	`35`	`environment:`
`36`		`- - WORDPRESS_DB_USER`
`37`		`- - WORDPRESS_DB_PASSWORD`
	`36`	`+ - WORDPRESS_DB_HOST`
	`37`	`+ - WORDPRESS_DB_USER=${MYSQL_USER}`
	`38`	`+ - WORDPRESS_DB_PASSWORD=${MYSQL_PASSWORD}`
`38`	`39`	`networks:`
`39`	`40`	`- site-network`
`40`	`41`
`@@ -44,9 +45,9 @@ services:`
`44`	`45`	`- php`
`45`	`46`	`restart: always`
`46`	`47`	`environment:`
`47`		`- - VIRTUAL_HOST=site1.test`
	`48`	`+ - VIRTUAL_HOST`
`48`	`49`	`volumes:`
`49`		`- - "./wordpress:/var/www/html"`
	`50`	`+ - "./app/src:/var/www/html"`
`50`	`51`	`- "./config/nginx/default.conf:/etc/nginx/conf.d/default.conf"`
`51`	`52`	`- "./logs/nginx:/var/log/nginx"`
`52`	`53`	`networks:`
`@@ -55,4 +56,4 @@ services:`
`55`	`56`	`networks:`
`56`	`57`	`site-network:`
`57`	`58`	`external:`
`58`		`- name: custom-network`
	`59`	`+ name: ${VIRTUAL_HOST}`

`‎multiple-sites/README.md‎`

Lines changed: 0 additions & 50 deletions

This file was deleted.

`‎multiple-sites/config/nginx/default.conf‎`

Lines changed: 0 additions & 31 deletions

This file was deleted.

`‎multiple-sites/setup.sh‎`

Lines changed: 0 additions & 83 deletions

This file was deleted.

`‎single-site/README.md‎`

Lines changed: 0 additions & 16 deletions

This file was deleted.

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit aacd7e1

File tree

17 files changed

17 files changed

`‎.gitignore‎`

`‎multiple-sites/.env.deployer‎ renamed to ‎config/.env.deployer‎`

`‎multiple-sites/.env.example‎ renamed to ‎config/.env.example‎`

`‎wp-multisite/config/nginx/default.conf‎ renamed to ‎config/nginx/default.conf‎`

`‎multiple-sites/config/php-fpm/php.ini‎ renamed to ‎config/php-fpm/php.ini‎`

`‎multiple-sites/docker-compose.yml‎ renamed to ‎docker-compose.yml‎`

`‎multiple-sites/README.md‎`

`‎multiple-sites/config/nginx/default.conf‎`

`‎multiple-sites/setup.sh‎`

`‎single-site/README.md‎`

0 commit comments