Skip to content

Commit 1e47619

Browse files
committed
format: replace tabs with spaces
1 parent b1cc9cb commit 1e47619

File tree

2 files changed

+48
-48
lines changed

2 files changed

+48
-48
lines changed

.github/workflows/deploy.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ jobs:
9898

9999
- name: Move Wiki Nginx cache
100100
run: |
101-
rm -rf /tmp/.buildx-cache-wiki
101+
rm -rf /tmp/.buildx-cache-wiki-nginx
102102
mv /tmp/.buildx-cache-wiki-nginx-new /tmp/.buildx-cache-wiki-nginx
103103
104104
- name: Cache Docker layers for Wiki Mediawiki
@@ -120,7 +120,7 @@ jobs:
120120

121121
- name: Move Wiki Mediawiki cache
122122
run: |
123-
rm -rf /tmp/.buildx-cache-wiki-nginx
123+
rm -rf /tmp/.buildx-cache-wiki
124124
mv /tmp/.buildx-cache-wiki-new /tmp/.buildx-cache-wiki
125125
126126
push:

nginx/wiki.metaploy.conf

+46-46
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,56 @@
11
upstream metawiki_server {
2-
server metawiki:80;
2+
server metawiki:80;
33
}
44

55
# Wiki configuration
66
server {
7-
server_name wiki.metakgp.org metakgp.org;
7+
server_name wiki.metakgp.org metakgp.org;
88

9-
index index.php index.html;
10-
autoindex off;
9+
index index.php index.html;
10+
autoindex off;
1111

12-
location / {
13-
proxy_pass http://metawiki_server;
14-
proxy_set_header Host $host;
15-
proxy_set_header X-Real-IP $remote_addr;
16-
proxy_set_header X-Forwarded-Host $host;
17-
proxy_set_header X-Forwarded-Server $host;
18-
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
19-
}
12+
location / {
13+
proxy_pass http://metawiki_server;
14+
proxy_set_header Host $host;
15+
proxy_set_header X-Real-IP $remote_addr;
16+
proxy_set_header X-Forwarded-Host $host;
17+
proxy_set_header X-Forwarded-Server $host;
18+
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
19+
}
2020

21-
###################### Cloudflare masks real IPs #########################
22-
# We are using cloudflare for DNS management #
23-
# Cloudflare masks the real ip of the user with its ips #
24-
# Here we are specifying cloudflare to provide with the user's actual ip #
25-
# via sending a special header. #
26-
##########################################################################
21+
###################### Cloudflare masks real IPs #########################
22+
# We are using cloudflare for DNS management #
23+
# Cloudflare masks the real ip of the user with its ips #
24+
# Here we are specifying cloudflare to provide with the user's actual ip #
25+
# via sending a special header. #
26+
##########################################################################
2727

28-
# IPv4
29-
set_real_ip_from 173.245.48.0/20;
30-
set_real_ip_from 103.21.244.0/22;
31-
set_real_ip_from 103.22.200.0/22;
32-
set_real_ip_from 103.31.4.0/22;
33-
set_real_ip_from 141.101.64.0/18;
34-
set_real_ip_from 108.162.192.0/18;
35-
set_real_ip_from 190.93.240.0/20;
36-
set_real_ip_from 188.114.96.0/20;
37-
set_real_ip_from 197.234.240.0/22;
38-
set_real_ip_from 198.41.128.0/17;
39-
set_real_ip_from 162.158.0.0/15;
40-
set_real_ip_from 104.16.0.0/13;
41-
set_real_ip_from 104.24.0.0/14;
42-
set_real_ip_from 172.64.0.0/13;
43-
set_real_ip_from 131.0.72.0/22;
44-
set_real_ip_from 172.19.0.0/16;
45-
46-
# IPv6
47-
set_real_ip_from 2400:cb00::/32;
48-
set_real_ip_from 2606:4700::/32;
49-
set_real_ip_from 2803:f800::/32;
50-
set_real_ip_from 2405:b500::/32;
51-
set_real_ip_from 2405:8100::/32;
52-
set_real_ip_from 2a06:98c0::/29;
53-
set_real_ip_from 2c0f:f248::/32;
54-
55-
real_ip_header CF-Connecting-IP;
28+
# IPv4
29+
set_real_ip_from 173.245.48.0/20;
30+
set_real_ip_from 103.21.244.0/22;
31+
set_real_ip_from 103.22.200.0/22;
32+
set_real_ip_from 103.31.4.0/22;
33+
set_real_ip_from 141.101.64.0/18;
34+
set_real_ip_from 108.162.192.0/18;
35+
set_real_ip_from 190.93.240.0/20;
36+
set_real_ip_from 188.114.96.0/20;
37+
set_real_ip_from 197.234.240.0/22;
38+
set_real_ip_from 198.41.128.0/17;
39+
set_real_ip_from 162.158.0.0/15;
40+
set_real_ip_from 104.16.0.0/13;
41+
set_real_ip_from 104.24.0.0/14;
42+
set_real_ip_from 172.64.0.0/13;
43+
set_real_ip_from 131.0.72.0/22;
44+
set_real_ip_from 172.19.0.0/16;
45+
46+
# IPv6
47+
set_real_ip_from 2400:cb00::/32;
48+
set_real_ip_from 2606:4700::/32;
49+
set_real_ip_from 2803:f800::/32;
50+
set_real_ip_from 2405:b500::/32;
51+
set_real_ip_from 2405:8100::/32;
52+
set_real_ip_from 2a06:98c0::/29;
53+
set_real_ip_from 2c0f:f248::/32;
54+
55+
real_ip_header CF-Connecting-IP;
5656
}

0 commit comments

Comments
 (0)