Skip to content

Commit

Permalink
format: replace tabs with spaces
Browse files Browse the repository at this point in the history
  • Loading branch information
proffapt committed Jul 2, 2024
1 parent b1cc9cb commit 1e47619
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 48 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ jobs:

- name: Move Wiki Nginx cache
run: |
rm -rf /tmp/.buildx-cache-wiki
rm -rf /tmp/.buildx-cache-wiki-nginx
mv /tmp/.buildx-cache-wiki-nginx-new /tmp/.buildx-cache-wiki-nginx
- name: Cache Docker layers for Wiki Mediawiki
Expand All @@ -120,7 +120,7 @@ jobs:

- name: Move Wiki Mediawiki cache
run: |
rm -rf /tmp/.buildx-cache-wiki-nginx
rm -rf /tmp/.buildx-cache-wiki
mv /tmp/.buildx-cache-wiki-new /tmp/.buildx-cache-wiki
push:
Expand Down
92 changes: 46 additions & 46 deletions nginx/wiki.metaploy.conf
Original file line number Diff line number Diff line change
@@ -1,56 +1,56 @@
upstream metawiki_server {
server metawiki:80;
server metawiki:80;
}

# Wiki configuration
server {
server_name wiki.metakgp.org metakgp.org;
server_name wiki.metakgp.org metakgp.org;

index index.php index.html;
autoindex off;
index index.php index.html;
autoindex off;

location / {
proxy_pass http://metawiki_server;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-Host $host;
proxy_set_header X-Forwarded-Server $host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
}
location / {
proxy_pass http://metawiki_server;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-Host $host;
proxy_set_header X-Forwarded-Server $host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
}

###################### Cloudflare masks real IPs #########################
# We are using cloudflare for DNS management #
# Cloudflare masks the real ip of the user with its ips #
# Here we are specifying cloudflare to provide with the user's actual ip #
# via sending a special header. #
##########################################################################
###################### Cloudflare masks real IPs #########################
# We are using cloudflare for DNS management #
# Cloudflare masks the real ip of the user with its ips #
# Here we are specifying cloudflare to provide with the user's actual ip #
# via sending a special header. #
##########################################################################

# IPv4
set_real_ip_from 173.245.48.0/20;
set_real_ip_from 103.21.244.0/22;
set_real_ip_from 103.22.200.0/22;
set_real_ip_from 103.31.4.0/22;
set_real_ip_from 141.101.64.0/18;
set_real_ip_from 108.162.192.0/18;
set_real_ip_from 190.93.240.0/20;
set_real_ip_from 188.114.96.0/20;
set_real_ip_from 197.234.240.0/22;
set_real_ip_from 198.41.128.0/17;
set_real_ip_from 162.158.0.0/15;
set_real_ip_from 104.16.0.0/13;
set_real_ip_from 104.24.0.0/14;
set_real_ip_from 172.64.0.0/13;
set_real_ip_from 131.0.72.0/22;
set_real_ip_from 172.19.0.0/16;
# IPv6
set_real_ip_from 2400:cb00::/32;
set_real_ip_from 2606:4700::/32;
set_real_ip_from 2803:f800::/32;
set_real_ip_from 2405:b500::/32;
set_real_ip_from 2405:8100::/32;
set_real_ip_from 2a06:98c0::/29;
set_real_ip_from 2c0f:f248::/32;
real_ip_header CF-Connecting-IP;
# IPv4
set_real_ip_from 173.245.48.0/20;
set_real_ip_from 103.21.244.0/22;
set_real_ip_from 103.22.200.0/22;
set_real_ip_from 103.31.4.0/22;
set_real_ip_from 141.101.64.0/18;
set_real_ip_from 108.162.192.0/18;
set_real_ip_from 190.93.240.0/20;
set_real_ip_from 188.114.96.0/20;
set_real_ip_from 197.234.240.0/22;
set_real_ip_from 198.41.128.0/17;
set_real_ip_from 162.158.0.0/15;
set_real_ip_from 104.16.0.0/13;
set_real_ip_from 104.24.0.0/14;
set_real_ip_from 172.64.0.0/13;
set_real_ip_from 131.0.72.0/22;
set_real_ip_from 172.19.0.0/16;

# IPv6
set_real_ip_from 2400:cb00::/32;
set_real_ip_from 2606:4700::/32;
set_real_ip_from 2803:f800::/32;
set_real_ip_from 2405:b500::/32;
set_real_ip_from 2405:8100::/32;
set_real_ip_from 2a06:98c0::/29;
set_real_ip_from 2c0f:f248::/32;

real_ip_header CF-Connecting-IP;
}

0 comments on commit 1e47619

Please sign in to comment.