diff options
| -rw-r--r-- | nginx/gallery_remmy_io.sls | 15 | ||||
| -rw-r--r-- | nginx/remmy_io.sls | 11 |
2 files changed, 8 insertions, 18 deletions
diff --git a/nginx/gallery_remmy_io.sls b/nginx/gallery_remmy_io.sls index b1a9135..a723729 100644 --- a/nginx/gallery_remmy_io.sls +++ b/nginx/gallery_remmy_io.sls @@ -13,7 +13,7 @@ nginx: - root: /srv/http - location /: - - return: '301 https://$server_name$request_uri' + - return: '301 https://gallery.remmy.foo$request_uri' - server: - server_name: gallery.remmy.io @@ -53,13 +53,8 @@ nginx: - root: /srv/http - location /: - - proxy_http_version: '1.1' - - proxy_pass: http://127.0.0.1:8186 - - proxy_set_header: X-Real-IP $remote_addr - - proxy_set_header: X-Forwarded-Proto https - - 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 + - return: '301 https://gallery.remmy.foo$request_uri' + gallery-static.remmy.io: enabled: True @@ -73,7 +68,7 @@ nginx: - root: /srv/http - location /: - - return: '301 https://$server_name$request_uri' + - return: '301 https://gallery-static.remmy.foo$request_uri' - server: @@ -111,6 +106,6 @@ nginx: - root: /srv/http - location /: - - proxy_pass: http://gallery-static.remmy.io.eu-central-1.linodeobjects.com/ + - return: '301 https://gallery-static.remmy.foo$request_uri' # vim: ft=yaml et: diff --git a/nginx/remmy_io.sls b/nginx/remmy_io.sls index 78dab71..0431775 100644 --- a/nginx/remmy_io.sls +++ b/nginx/remmy_io.sls @@ -13,7 +13,7 @@ nginx: - root: /srv/http - location /: - - return: '301 https://$server_name$request_uri' + - return: '301 https://remmy.foo$request_uri' - server: @@ -47,15 +47,10 @@ nginx: - error_log: /var/log/nginx/remmy_io.error.log - - root: /home/kyrias/public_html/remmy.io/ - - index: start.html index.html - - autoindex: 'on' - - try_files: $uri $uri.html $uri/ =404 - - location /.well-known/acme-challenge: - root: /srv/http - - location ~ \.(js|css|png): - - expires: modified +7d + - location /: + - return: '301 https://remmy.foo$request_uri' # vim: ft=yaml et: |