Skip to content

Commit eb71a55

Browse files
author
Vien
committed
modify .gitignore
1 parent a18a71b commit eb71a55

File tree

9 files changed

+103
-90
lines changed

9 files changed

+103
-90
lines changed

‎.gitignore

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
services/mysql/data/
2-
logs/
31
.DS_Store
42
*/.DS_Store
53
*.log

‎apps/.gitignore ‎apps/app/.gitignore

File renamed without changes.

‎docker-compose.yml

+10-10
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,25 @@ services:
33
# mysql
44
mysql:
55
image: mysql:5.7.19
6-
container_name: weengine-mysql
6+
container_name: mysql
77
ports:
8-
- 3308:3306
8+
- 3306:3306
99
volumes:
1010
- ./services/mysql/data:/var/lib/mysql
1111
- ./services/mysql/config/mysql.conf.d/mysqld.cnf:/etc/mysql/mysql.conf.d/mysqld.cnf
1212
- ./logs/mysql:/var/log/mysql
1313
- ./services/mysql/run/mysqld:/var/run/mysqld
1414
restart: always
1515
environment:
16-
MYSQL_ROOT_PASSWORD: luvvien1314
17-
MYSQL_DATABASE: weengine
18-
MYSQL_USER: weengine
19-
MYSQL_PASSWORD: luvvien1314@me
16+
MYSQL_ROOT_PASSWORD: luvvien
17+
MYSQL_DATABASE: luvvien
18+
MYSQL_USER: luvvien
19+
MYSQL_PASSWORD: luvvien
2020

2121
# php-fpm
2222
php-fpm:
2323
image: luvvien/docker-php-fpm-composer:latest
24-
container_name: weengine-php-fpm
24+
container_name: php-fpm
2525
volumes:
2626
- ./apps:/apps
2727
- ./services/php/config/php.ini:/usr/local/etc/php/php.ini
@@ -33,10 +33,10 @@ services:
3333
# nginx
3434
nginx:
3535
image: nginx:latest
36-
container_name: weengine-nginx
36+
container_name: nginx
3737
ports:
38-
- 8086:80
39-
- 10443:443
38+
- 80:80
39+
- 443:443
4040
links:
4141
- mysql
4242
depends_on:

‎logs/mysql/.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# ignore all except .gitignore file
2+
*
3+
!.gitignore

‎logs/nginx/.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# ignore all except .gitignore file
2+
*
3+
!.gitignore

‎services/mysql/data/.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# ignore all except .gitignore file
2+
*
3+
!.gitignore

‎services/mysql/run/mysqld/.gitignore

100644100755
+3-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
services/mysql/data/
2-
logs/
3-
.DS_Store
4-
*/.DS_Store
5-
*.log
6-
*.swp
1+
# ignore all except .gitignore file
2+
*
3+
!.gitignore

‎services/nginx/config/conf.d/default.conf

100644100755
+59-59
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,59 @@
1-
server {
2-
listen 80;
3-
server_name luv.vien.我爱你 luv.vien.xn--6qq986b3xl;
4-
return 301 https://luv.vien.xn--6qq986b3xl$request_uri;
5-
}
6-
7-
server {
8-
listen 443 ssl;
9-
10-
ssl on;
11-
ssl_certificate cert/ssl.crt;
12-
ssl_certificate_key cert/ssl.key;
13-
ssl_session_timeout 5m;
14-
ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:ECDHE:ECDH:AES:HIGH:!NULL:!aNULL:!MD5:!ADH:!RC4;
15-
ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
16-
ssl_prefer_server_ciphers on;
17-
18-
root /apps/app/public;
19-
index index.php index.html index.htm;
20-
21-
server_name luv.vien.我爱你 luv.vien.xn--6qq986b3xl;
22-
if ( $host != 'luv.vien.xn--6qq986b3xl' ) {
23-
rewrite ^/(.*)$ https://luv.vien.xn--6qq986b3xl/$1 permanent;
24-
}
25-
26-
client_max_body_size 1024M;
27-
28-
access_log /var/log/nginx/blog_access.log;
29-
error_log /var/log/nginx/blog_error.log;
30-
31-
location / {
32-
try_files $uri $uri/ /index.php?$query_string;
33-
}
34-
35-
location ~ \.php$ {
36-
fastcgi_pass php-upstream;
37-
fastcgi_index index.php;
38-
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
39-
include fastcgi_params;
40-
}
41-
# cache.appcache, your document html and data
42-
location ~* \.(?:manifest|appcache|html?|xml|json)$ {
43-
expires -1;
44-
}
45-
46-
# Media: images, icons, video, audio, HTC
47-
location ~* \.(?:ttf|jpg|jpeg|gif|png|ico|cur|gz|svg|svgz|mp4|ogg|ogv|webm|htc)$ {
48-
expires 1M;
49-
access_log off;
50-
add_header Cache-Control "public";
51-
}
52-
53-
# CSS and Javascript
54-
location ~* \.(?:css|js)$ {
55-
expires 1y;
56-
access_log off;
57-
add_header Cache-Control "public";
58-
}
59-
}
1+
#server {
2+
# listen 80;
3+
# server_name luv.vien.我爱你 luv.vien.xn--6qq986b3xl;
4+
# return 301 https://luv.vien.xn--6qq986b3xl$request_uri;
5+
#}
6+
#
7+
#server {
8+
# listen 443 ssl;
9+
#
10+
# ssl on;
11+
# ssl_certificate cert/ssl.crt;
12+
# ssl_certificate_key cert/ssl.key;
13+
# ssl_session_timeout 5m;
14+
# ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:ECDHE:ECDH:AES:HIGH:!NULL:!aNULL:!MD5:!ADH:!RC4;
15+
# ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
16+
# ssl_prefer_server_ciphers on;
17+
#
18+
# root /apps/app/public;
19+
# index index.php index.html index.htm;
20+
#
21+
# server_name luv.vien.我爱你 luv.vien.xn--6qq986b3xl;
22+
# if ( $host != 'luv.vien.xn--6qq986b3xl' ) {
23+
# rewrite ^/(.*)$ https://luv.vien.xn--6qq986b3xl/$1 permanent;
24+
# }
25+
#
26+
# client_max_body_size 1024M;
27+
#
28+
# access_log /var/log/nginx/blog_access.log;
29+
# error_log /var/log/nginx/blog_error.log;
30+
#
31+
# location / {
32+
# try_files $uri $uri/ /index.php?$query_string;
33+
# }
34+
#
35+
# location ~ \.php$ {
36+
# fastcgi_pass php-upstream;
37+
# fastcgi_index index.php;
38+
# fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
39+
# include fastcgi_params;
40+
# }
41+
# # cache.appcache, your document html and data
42+
# location ~* \.(?:manifest|appcache|html?|xml|json)$ {
43+
# expires -1;
44+
# }
45+
#
46+
# # Media: images, icons, video, audio, HTC
47+
# location ~* \.(?:ttf|jpg|jpeg|gif|png|ico|cur|gz|svg|svgz|mp4|ogg|ogv|webm|htc)$ {
48+
# expires 1M;
49+
# access_log off;
50+
# add_header Cache-Control "public";
51+
# }
52+
#
53+
# # CSS and Javascript
54+
# location ~* \.(?:css|js)$ {
55+
# expires 1y;
56+
# access_log off;
57+
# add_header Cache-Control "public";
58+
# }
59+
#}

‎services/nginx/config/conf.d/local.conf

100644100755
+22-13
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,22 @@
1-
#server {
2-
# listen 80;
3-
# server_name _;
4-
#
5-
# root /apps/app/public;
6-
# index index.php index.html index.htm;
7-
#
8-
# access_log /var/log/nginx/access.log;
9-
# error_log /var/log/nginx/error.log;
10-
#
11-
# include conf.d/CommonWp.main;
12-
#
13-
#}
1+
server {
2+
listen 80;
3+
server_name _;
4+
5+
root /apps/app/public;
6+
index index.php index.html index.htm;
7+
8+
access_log /var/log/nginx/access.log;
9+
error_log /var/log/nginx/error.log;
10+
11+
location / {
12+
try_files $uri $uri/ /index.php?$query_string;
13+
}
14+
15+
location ~ \.php$ {
16+
fastcgi_pass php-upstream;
17+
fastcgi_index index.php;
18+
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
19+
include fastcgi_params;
20+
}
21+
22+
}

0 commit comments

Comments
 (0)