summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Löthberg <johannes@kyriasis.com>2023-11-06 21:17:55 +0000
committerJohannes Löthberg <johannes@kyriasis.com>2023-11-06 21:17:55 +0000
commitff87858ddc019d07293d2c4a02b811e19b92cbd5 (patch)
treedcc59ba709f1a0f822faa1385499890ae09915a3
parentaf4309b49b1ce82fc1bd76b539870feaa2e411d5 (diff)
downloadpillar-ff87858ddc019d07293d2c4a02b811e19b92cbd5.tar.xz
Add old gallery changes
-rw-r--r--nginx/gallery_remmy_io.sls24
-rw-r--r--top.sls2
2 files changed, 11 insertions, 15 deletions
diff --git a/nginx/gallery_remmy_io.sls b/nginx/gallery_remmy_io.sls
index 72b5202..29b3d27 100644
--- a/nginx/gallery_remmy_io.sls
+++ b/nginx/gallery_remmy_io.sls
@@ -52,11 +52,11 @@ nginx:
- proxy_http_version: '1.1'
- proxy_pass: http://127.0.0.1:8186
- gallery-bypass.remmy.io:
+ gallery-static.remmy.io:
enabled: True
config:
- server:
- - server_name: gallery-bypass.remmy.io
+ - server_name: gallery-static.remmy.io
- listen: 80
- listen: '[::]:80'
@@ -68,17 +68,17 @@ nginx:
- server:
- - server_name: gallery-bypass.remmy.io
+ - server_name: gallery-static.remmy.io
- listen: 443 ssl http2
- listen: '[::]:443 ssl http2'
- - ssl_certificate: /etc/letsencrypt/live/gallery-bypass.remmy.io/fullchain.pem
- - ssl_certificate_key: /etc/letsencrypt/live/gallery-bypass.remmy.io/privkey.pem
+ - ssl_certificate: /etc/letsencrypt/live/gallery-static.remmy.io/fullchain.pem
+ - ssl_certificate_key: /etc/letsencrypt/live/gallery-static.remmy.io/privkey.pem
- ssl_dhparam: /etc/nginx/dhparam.pem
- ssl_stapling: 'on'
- ssl_stapling_verify: 'on'
- - ssl_trusted_certificate: /etc/letsencrypt/live/gallery-bypass.remmy.io/fullchain.pem
+ - ssl_trusted_certificate: /etc/letsencrypt/live/gallery-static.remmy.io/fullchain.pem
# https://developer.mozilla.org/en-US/docs/Security/HTTP_Strict_Transport_Security
- add_header: 'Strict-Transport-Security "max-age=31536000"'
@@ -96,16 +96,12 @@ nginx:
# http://www.gnuterrypratchett.com/
- add_header: 'X-Clacks-Overhead "GNU Terry Pratchett"'
- - error_log: /var/log/nginx/gallery-bypass.error.log
+ - error_log: /var/log/nginx/gallery_static_remmy_io.error.log
- - try_files: $uri $uri.html $uri/ =404
-
- - client_max_body_size: 500m
+ - location /.well-known/acme-challenge:
+ - root: /srv/http
- location /:
- - proxy_http_version: '1.1'
- - proxy_pass: http://127.0.0.1:8186
- - proxy_read_timeout: 180s
- - proxy_send_timeout: 180s
+ - proxy_pass: http://gallery-static.remmy.io.eu-central-1.linodeobjects.com/
# vim: ft=yaml et:
diff --git a/top.sls b/top.sls
index b4bebad..08c1617 100644
--- a/top.sls
+++ b/top.sls
@@ -10,7 +10,7 @@ base:
- nginx.grafana_kyriasis_com
- nginx.repsys_kyriasis_com
- nginx.remmy_io
- #- nginx.gallery_remmy_io
+ - nginx.gallery_remmy_io
- opensmtpd.theos