Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 6a4c436

Browse files
fix some errors
1 parent 36fe7fd commit 6a4c436

File tree

9 files changed

+157
-61
lines changed

9 files changed

+157
-61
lines changed

‎app/.github/CONTRIBUTING.md‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎app/.github/ISSUE_TEMPLATE.md‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎app/.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎docker-compose.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ nginx:
1111
restart: always
1212
image: nginx
1313
ports:
14-
- "8099:80"
14+
- "99:80"
1515
links:
1616
- phpfpm:phpfpm
1717
volumes:

‎log/nginx/access.log‎

Lines changed: 144 additions & 0 deletions
Large diffs are not rendered by default.

‎log/nginx/error.log‎

Whitespace-only changes.

‎log/nginx/new-access.log‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
172.17.0.1 - - [09/Jul/2017:16:53:58 +0000] "GET / HTTP/1.1" 404 571 "-" "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36"
2+
172.17.0.1 - - [09/Jul/2017:16:53:58 +0000] "GET /favicon.ico HTTP/1.1" 404 571 "http://localhost:99/" "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36"
3+
172.17.0.1 - - [09/Jul/2017:18:07:13 +0000] "GET / HTTP/1.1" 404 571 "-" "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36"
4+
172.17.0.1 - - [09/Jul/2017:18:07:30 +0000] "GET / HTTP/1.1" 404 571 "-" "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36"
5+
172.17.0.1 - - [09/Jul/2017:18:07:31 +0000] "GET / HTTP/1.1" 404 571 "-" "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36"
6+
172.17.0.1 - - [09/Jul/2017:18:07:31 +0000] "GET / HTTP/1.1" 404 571 "-" "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36"

‎log/nginx/new-error.log‎

Whitespace-only changes.

‎nginx/vhost.conf‎

Lines changed: 6 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
server {
22
#listen [::]:80 ipv6only=on; # listen for IPv6
3-
server_name docker.my;
4-
root /var/www/html/yii;
3+
root /var/www/html;
54

6-
access_log /var/log/nginx/new-access.log;
7-
error_log /var/log/nginx/new-error.log;
5+
access_log /var/log/nginx/access.log;
6+
error_log /var/log/nginx/error.log;
87
charset utf-8;
9-
client_max_body_size 100M;
8+
client_max_body_size 10M;
109

1110
location / {
12-
root /var/www/html/yii/frontend/web/;
11+
root /var/www/html/frontend/web/;
1312
try_files $uri /index.php?$args;
1413
}
1514

16-
1715
location ~* \.php$ {
1816
try_files $uri /frontend/web$uri =404;
1917
# check the www.conf file to see if PHP-FPM is listening on a socket or a port
@@ -35,30 +33,8 @@ server {
3533
}
3634

3735

38-
39-
location /api {
40-
alias /var/www/html/yii/frontend/web;
41-
try_files $uri /frontend/web/index.php?$args;
42-
43-
# redirect to the page without a trailing slash (uncomment if necessary)
44-
#location = /admin/ {
45-
# return 301 /admin;
46-
#}
47-
48-
location ~* ^/admin/(.+\.php)$ {
49-
try_files $uri /frontend/web/1ドル?$args;
50-
}
51-
52-
# avoid processing of calls to non-existing static files by Yii (uncomment if necessary)
53-
#location ~* ^/admin/(.+\.(css|js|jpg|jpeg|png|gif|bmp|ico|mov|swf|pdf|zip|rar))$ {
54-
# try_files $uri /frontend/web/1ドル?$args;
55-
#}
56-
}
57-
58-
59-
6036
location /admin {
61-
alias /var/www/html/yii/backend/web;
37+
alias /var/www/html/backend/web;
6238
try_files $uri /backend/web/index.php?$args;
6339

6440
# redirect to the page without a trailing slash (uncomment if necessary)
@@ -82,6 +58,4 @@ server {
8258
}
8359

8460

85-
86-
8761
}

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /