diff options
author | Johannes Löthberg <johannes@kyriasis.com> | 2019-05-30 17:02:57 +0200 |
---|---|---|
committer | Johannes Löthberg <johannes@kyriasis.com> | 2019-05-30 17:02:57 +0200 |
commit | 75a5880d96818cae3bed945267e62c1d3927f2c1 (patch) | |
tree | cc375a3e245bc62d276bb46a95e4df580dfc9f77 | |
parent | 3011fe0d74ec61c5f7792f6d58c0e781737f1889 (diff) | |
download | pillar-75a5880d96818cae3bed945267e62c1d3927f2c1.tar.xz |
Update to nginx formula >1.0.0
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
-rw-r--r-- | nginx/base.sls | 73 | ||||
-rw-r--r-- | nginx/git_kyriasis_com.sls | 93 | ||||
-rw-r--r-- | nginx/grafana_kyriasis_com.sls | 77 | ||||
-rw-r--r-- | nginx/kyriasis_com.sls | 93 | ||||
-rw-r--r-- | nginx/matrix_kyriasis_com.sls | 123 | ||||
-rw-r--r-- | nginx/miniflux_kyriasis_com.sls | 91 | ||||
-rw-r--r-- | nginx/remmy_io.sls | 85 | ||||
-rw-r--r-- | nginx/repsys_kyriasis_com.sls | 83 | ||||
-rw-r--r-- | nginx/riot_kyriasis_com.sls | 81 | ||||
-rw-r--r-- | nginx/theos_kyriasis_com.sls | 211 | ||||
-rw-r--r-- | nginx/xan_kyriasis_com.sls | 117 |
11 files changed, 558 insertions, 569 deletions
diff --git a/nginx/base.sls b/nginx/base.sls index 47f430a..587ac71 100644 --- a/nginx/base.sls +++ b/nginx/base.sls @@ -1,42 +1,41 @@ nginx: - ng: - source: - opts: {} - service: - enable: True - opts: {} - server: - config: - events: - worker_connections: 1024 - http: - sendfile: 'on' - aio: 'on' - directio: 4m - keepalive_timeout: 65 - gzip: 'on' - gzip_proxied: 'any' - gzip_types: '*' - gzip_vary: 'on' - charset: utf-8 - charset_types: text/xml text/plain application/javascript application/rss+xml - server_tokens: 'off' - etag: 'on' - ssi: 'on' + source: + opts: {} + service: + enable: True + opts: {} + server: + config: + events: + worker_connections: 1024 + http: + sendfile: 'on' + aio: 'on' + directio: 4m + keepalive_timeout: 65 + gzip: 'on' + gzip_proxied: 'any' + gzip_types: '*' + gzip_vary: 'on' + charset: utf-8 + charset_types: text/xml text/plain application/javascript application/rss+xml + server_tokens: 'off' + etag: 'on' + ssi: 'on' - include: - - /etc/nginx/mime.types - - /etc/nginx/conf.d/*.conf - - /etc/nginx/sites-enabled/* + include: + - /etc/nginx/mime.types + - /etc/nginx/conf.d/*.conf + - /etc/nginx/sites-enabled/* - servers: - managed_opts: - require_in: - - file: nginx_server_available_dir - symlink_opts: - require_in: - - file: nginx_server_enabled_dir - dir_opts: - clean: 'on' + servers: + managed_opts: + require_in: + - file: nginx_server_available_dir + symlink_opts: + require_in: + - file: nginx_server_enabled_dir + dir_opts: + clean: 'on' # vim: ft=yaml et: diff --git a/nginx/git_kyriasis_com.sls b/nginx/git_kyriasis_com.sls index 74e0442..b151af7 100644 --- a/nginx/git_kyriasis_com.sls +++ b/nginx/git_kyriasis_com.sls @@ -1,66 +1,65 @@ nginx: - ng: - servers: - managed: - git.kyriasis.com: - enabled: True - config: - - server: - - server_name: git.kyriasis.com - - listen: 80 - - listen: '[::]:80' + servers: + managed: + git.kyriasis.com: + enabled: True + config: + - server: + - server_name: git.kyriasis.com + - listen: 80 + - listen: '[::]:80' - - location /.well-known/acme-challenge: - - root: /srv/http/ + - location /.well-known/acme-challenge: + - root: /srv/http/ - - location /: - - return: '301 https://$server_name$request_uri' + - location /: + - return: '301 https://$server_name$request_uri' - - server: - - server_name: git.kyriasis.com - - listen: 443 ssl http2 - - listen: '[::]:443 ssl http2' + - server: + - server_name: git.kyriasis.com + - listen: 443 ssl http2 + - listen: '[::]:443 ssl http2' - - ssl: 'on' - - ssl_certificate: /etc/letsencrypt/live/git.kyriasis.com/fullchain.pem - - ssl_certificate_key: /etc/letsencrypt/live/git.kyriasis.com/privkey.pem - - ssl_dhparam: /etc/nginx/dhparam.pem + - ssl: 'on' + - ssl_certificate: /etc/letsencrypt/live/git.kyriasis.com/fullchain.pem + - ssl_certificate_key: /etc/letsencrypt/live/git.kyriasis.com/privkey.pem + - ssl_dhparam: /etc/nginx/dhparam.pem - - ssl_stapling: 'on' - - ssl_stapling_verify: 'on' - - ssl_trusted_certificate: /etc/letsencrypt/live/git.kyriasis.com/fullchain.pem + - ssl_stapling: 'on' + - ssl_stapling_verify: 'on' + - ssl_trusted_certificate: /etc/letsencrypt/live/git.kyriasis.com/fullchain.pem - # https://developer.mozilla.org/en-US/docs/Security/HTTP_Strict_Transport_Security - - add_header: 'Strict-Transport-Security "max-age=31536000"' + # https://developer.mozilla.org/en-US/docs/Security/HTTP_Strict_Transport_Security + - add_header: 'Strict-Transport-Security "max-age=31536000"' - # Tell browsers not to render the page inside a frame, and avoid clickjacking. - - add_header: X-Frame-Options SAMEORIGIN + # Tell browsers not to render the page inside a frame, and avoid clickjacking. + - add_header: X-Frame-Options SAMEORIGIN - # Tell browsers to not try to auto-detect the Content-Type. - - add_header: X-Content-Type-Options nosniff + # Tell browsers to not try to auto-detect the Content-Type. + - add_header: X-Content-Type-Options nosniff - # Enable the Cross-site scripting filter in most recent browsers. - # Normally enabled by default, but enable it anyway if user has disabled it. - - add_header: 'X-XSS-Protection "1; mode=block"' + # Enable the Cross-site scripting filter in most recent browsers. + # Normally enabled by default, but enable it anyway if user has disabled it. + - add_header: 'X-XSS-Protection "1; mode=block"' - # http://www.gnuterrypratchett.com/ - - add_header: 'X-Clacks-Overhead "GNU Terry Pratchett"' + # http://www.gnuterrypratchett.com/ + - add_header: 'X-Clacks-Overhead "GNU Terry Pratchett"' - - error_log: /var/log/nginx/git.error.log + - error_log: /var/log/nginx/git.error.log - - root: /usr/share/webapps/cgit + - root: /usr/share/webapps/cgit - - try_files: $uri @cgit + - try_files: $uri @cgit - - location @cgit: - - include: fastcgi_params - - fastcgi_param: SCRIPT_FILENAME $document_root/cgit.cgi - - fastcgi_param: PATH_INFO $uri - - fastcgi_param: QUERY_STRING $args - - fastcgi_pass: unix:/run/fcgiwrap.sock + - location @cgit: + - include: fastcgi_params + - fastcgi_param: SCRIPT_FILENAME $document_root/cgit.cgi + - fastcgi_param: PATH_INFO $uri + - fastcgi_param: QUERY_STRING $args + - fastcgi_pass: unix:/run/fcgiwrap.sock - - location /.well-known/acme-challenge: - - root: /srv/http/ + - location /.well-known/acme-challenge: + - root: /srv/http/ # vim: ft=yaml et: diff --git a/nginx/grafana_kyriasis_com.sls b/nginx/grafana_kyriasis_com.sls index a2cdb0a..2a512fd 100644 --- a/nginx/grafana_kyriasis_com.sls +++ b/nginx/grafana_kyriasis_com.sls @@ -1,55 +1,54 @@ nginx: - ng: - servers: - managed: - grafana.kyriasis.com: - enabled: True - config: - - server: - - server_name: grafana.kyriasis.com - - listen: 80 - - listen: '[::]:80' + servers: + managed: + grafana.kyriasis.com: + enabled: True + config: + - server: + - server_name: grafana.kyriasis.com + - listen: 80 + - listen: '[::]:80' - - location /.well-known/acme-challenge: - - root: /srv/http + - location /.well-known/acme-challenge: + - root: /srv/http - - location /: - - return: '301 https://$server_name$request_uri' + - location /: + - return: '301 https://$server_name$request_uri' - - server: - - server_name: grafana.kyriasis.com - - listen: 443 ssl http2 - - listen: '[::]:443 ssl http2' + - server: + - server_name: grafana.kyriasis.com + - listen: 443 ssl http2 + - listen: '[::]:443 ssl http2' - - ssl: 'on' - - ssl_certificate: /etc/letsencrypt/live/grafana.kyriasis.com/fullchain.pem - - ssl_certificate_key: /etc/letsencrypt/live/grafana.kyriasis.com/privkey.pem - - ssl_dhparam: /etc/nginx/dhparam.pem + - ssl: 'on' + - ssl_certificate: /etc/letsencrypt/live/grafana.kyriasis.com/fullchain.pem + - ssl_certificate_key: /etc/letsencrypt/live/grafana.kyriasis.com/privkey.pem + - ssl_dhparam: /etc/nginx/dhparam.pem - - ssl_stapling: 'on' - - ssl_stapling_verify: 'on' - - ssl_trusted_certificate: /etc/letsencrypt/live/grafana.kyriasis.com/fullchain.pem + - ssl_stapling: 'on' + - ssl_stapling_verify: 'on' + - ssl_trusted_certificate: /etc/letsencrypt/live/grafana.kyriasis.com/fullchain.pem - # https://developer.mozilla.org/en-US/docs/Security/HTTP_Strict_Transport_Security - - add_header: 'Strict-Transport-Security "max-age=31536000"' + # https://developer.mozilla.org/en-US/docs/Security/HTTP_Strict_Transport_Security + - add_header: 'Strict-Transport-Security "max-age=31536000"' - # Tell browsers not to render the page inside a frame, and avoid clickjacking. - - add_header: X-Frame-Options SAMEORIGIN + # Tell browsers not to render the page inside a frame, and avoid clickjacking. + - add_header: X-Frame-Options SAMEORIGIN - # Tell browsers to not try to auto-detect the Content-Type. - - add_header: X-Content-Type-Options nosniff + # Tell browsers to not try to auto-detect the Content-Type. + - add_header: X-Content-Type-Options nosniff - # Enable the Cross-site scripting filter in most recent browsers. - # Normally enabled by default, but enable it anyway if user has disabled it. - - add_header: 'X-XSS-Protection "1; mode=block"' + # Enable the Cross-site scripting filter in most recent browsers. + # Normally enabled by default, but enable it anyway if user has disabled it. + - add_header: 'X-XSS-Protection "1; mode=block"' - # http://www.gnuterrypratchett.com/ - - add_header: 'X-Clacks-Overhead "GNU Terry Pratchett"' + # http://www.gnuterrypratchett.com/ + - add_header: 'X-Clacks-Overhead "GNU Terry Pratchett"' - - error_log: /var/log/nginx/grafana.kyriasis.com.error.log + - error_log: /var/log/nginx/grafana.kyriasis.com.error.log - - location /: - - proxy_pass: http://localhost:3000/ + - location /: + - proxy_pass: http://localhost:3000/ # vim: ft=yaml et: diff --git a/nginx/kyriasis_com.sls b/nginx/kyriasis_com.sls index 17f80fd..0f10e8e 100644 --- a/nginx/kyriasis_com.sls +++ b/nginx/kyriasis_com.sls @@ -1,65 +1,64 @@ nginx: - ng: - servers: - managed: - kyriasis.com: - enabled: True - config: - - server: - - server_name: kyriasis.com - - listen: 80 - - listen: '[::]:80' + servers: + managed: + kyriasis.com: + enabled: True + config: + - server: + - server_name: kyriasis.com + - listen: 80 + - listen: '[::]:80' - - location /.well-known/acme-challenge: - - root: /srv/http/ + - location /.well-known/acme-challenge: + - root: /srv/http/ - - location /: - - return: '301 https://$server_name$request_uri' + - location /: + - return: '301 https://$server_name$request_uri' - - server: - - server_name: kyriasis.com - - listen: 443 ssl http2 - - listen: '[::]:443 ssl http2' + - server: + - server_name: kyriasis.com + - listen: 443 ssl http2 + - listen: '[::]:443 ssl http2' - - ssl: 'on' - - ssl_certificate: /etc/letsencrypt/live/kyriasis.com/fullchain.pem - - ssl_certificate_key: /etc/letsencrypt/live/kyriasis.com/privkey.pem - - ssl_dhparam: /etc/nginx/dhparam.pem + - ssl: 'on' + - ssl_certificate: /etc/letsencrypt/live/kyriasis.com/fullchain.pem + - ssl_certificate_key: /etc/letsencrypt/live/kyriasis.com/privkey.pem + - ssl_dhparam: /etc/nginx/dhparam.pem - - ssl_stapling: 'on' - - ssl_stapling_verify: 'on' - - ssl_trusted_certificate: /etc/letsencrypt/live/kyriasis.com/fullchain.pem + - ssl_stapling: 'on' + - ssl_stapling_verify: 'on' + - ssl_trusted_certificate: /etc/letsencrypt/live/kyriasis.com/fullchain.pem - # https://developer.mozilla.org/en-US/docs/Security/HTTP_Strict_Transport_Security - - add_header: 'Strict-Transport-Security "max-age=31536000"' + # https://developer.mozilla.org/en-US/docs/Security/HTTP_Strict_Transport_Security + - add_header: 'Strict-Transport-Security "max-age=31536000"' - # Tell browsers not to render the page inside a frame, and avoid clickjacking. - - add_header: X-Frame-Options SAMEORIGIN + # Tell browsers not to render the page inside a frame, and avoid clickjacking. + - add_header: X-Frame-Options SAMEORIGIN - # Tell browsers to not try to auto-detect the Content-Type. - - add_header: X-Content-Type-Options nosniff + # Tell browsers to not try to auto-detect the Content-Type. + - add_header: X-Content-Type-Options nosniff - # Enable the Cross-site scripting filter in most recent browsers. - # Normally enabled by default, but enable it anyway if user has disabled it. - - add_header: 'X-XSS-Protection "1; mode=block"' + # Enable the Cross-site scripting filter in most recent browsers. + # Normally enabled by default, but enable it anyway if user has disabled it. + - add_header: 'X-XSS-Protection "1; mode=block"' - # http://www.gnuterrypratchett.com/ - - add_header: 'X-Clacks-Overhead "GNU Terry Pratchett"' + # http://www.gnuterrypratchett.com/ + - add_header: 'X-Clacks-Overhead "GNU Terry Pratchett"' - - client_max_body_size: 128m + - client_max_body_size: 128m - - error_log: /var/log/nginx/kyriasis.com.error.log + - error_log: /var/log/nginx/kyriasis.com.error.log - - location /.well-known/acme-challenge: - - root: /srv/http/ + - location /.well-known/acme-challenge: + - root: /srv/http/ - - location /.well-known/matrix/client: - - proxy_pass: https://matrix.kyriasis.com:8448 - - proxy_buffering: "off" - - proxy_set_header: X-Forwarded-For $remote_addr - - proxy_set_header: Host $host - - add_header: "'Access-Control-Allow-Origin' '*'" - - add_header: "'Access-Control-Allow-Methods' 'GET, PUT, POST, DELETE, HEAD, OPTIONS'" + - location /.well-known/matrix/client: + - proxy_pass: https://matrix.kyriasis.com:8448 + - proxy_buffering: "off" + - proxy_set_header: X-Forwarded-For $remote_addr + - proxy_set_header: Host $host + - add_header: "'Access-Control-Allow-Origin' '*'" + - add_header: "'Access-Control-Allow-Methods' 'GET, PUT, POST, DELETE, HEAD, OPTIONS'" # vim: ft=yaml et: diff --git a/nginx/matrix_kyriasis_com.sls b/nginx/matrix_kyriasis_com.sls index 8db809c..782149b 100644 --- a/nginx/matrix_kyriasis_com.sls +++ b/nginx/matrix_kyriasis_com.sls @@ -1,85 +1,84 @@ nginx: - ng: - servers: - managed: - matrix.kyriasis.com: - enabled: True - config: - - upstream matrix_backend: - - server: 127.0.0.1:8448 + servers: + managed: + matrix.kyriasis.com: + enabled: True + config: + - upstream matrix_backend: + - server: 127.0.0.1:8448 - - upstream synapse_metrics: - - server: 127.0.0.1:9091 + - upstream synapse_metrics: + - server: 127.0.0.1:9091 - - server: - - server_name: matrix.kyriasis.com - - listen: 80 - - listen: '[::]:80' + - server: + - server_name: matrix.kyriasis.com + - listen: 80 + - listen: '[::]:80' - - location /.well-known/acme-challenge: - - root: /srv/http/ + - location /.well-known/acme-challenge: + - root: /srv/http/ - - location /: - - return: '301 https://$server_name$request_uri' + - location /: + - return: '301 https://$server_name$request_uri' - - server: - - server_name: matrix.kyriasis.com kyriasis.com - - listen: 443 ssl http2 default_server - - listen: '[::]:443 ssl http2 default_server' + - server: + - server_name: matrix.kyriasis.com kyriasis.com + - listen: 443 ssl http2 default_server + - listen: '[::]:443 ssl http2 default_server' - - ssl: 'on' - - ssl_certificate: /etc/letsencrypt/live/matrix.kyriasis.com/fullchain.pem - - ssl_certificate_key: /etc/letsencrypt/live/matrix.kyriasis.com/privkey.pem - - ssl_dhparam: /etc/nginx/dhparam.pem + - ssl: 'on' + - ssl_certificate: /etc/letsencrypt/live/matrix.kyriasis.com/fullchain.pem + - ssl_certificate_key: /etc/letsencrypt/live/matrix.kyriasis.com/privkey.pem + - ssl_dhparam: /etc/nginx/dhparam.pem - - ssl_stapling: 'on' - - ssl_stapling_verify: 'on' - - ssl_trusted_certificate: /etc/letsencrypt/live/matrix.kyriasis.com/fullchain.pem + - ssl_stapling: 'on' + - ssl_stapling_verify: 'on' + - ssl_trusted_certificate: /etc/letsencrypt/live/matrix.kyriasis.com/fullchain.pem - # https://developer.mozilla.org/en-US/docs/Security/HTTP_Strict_Transport_Security - - add_header: 'Strict-Transport-Security "max-age=31536000"' + # https://developer.mozilla.org/en-US/docs/Security/HTTP_Strict_Transport_Security + - add_header: 'Strict-Transport-Security "max-age=31536000"' - # Tell browsers to not try to auto-detect the Content-Type. - - add_header: X-Content-Type-Options nosniff + # Tell browsers to not try to auto-detect the Content-Type. + - add_header: X-Content-Type-Options nosniff - # Enable the Cross-site scripting filter in most recent browsers. - # Normally enabled by default, but enable it anyway if user has disabled it. - - add_header: 'X-XSS-Protection "1; mode=block"' + # Enable the Cross-site scripting filter in most recent browsers. + # Normally enabled by default, but enable it anyway if user has disabled it. + - add_header: 'X-XSS-Protection "1; mode=block"' - # http://www.gnuterrypratchett.com/ - - add_header: 'X-Clacks-Overhead "GNU Terry Pratchett"' + # http://www.gnuterrypratchett.com/ + - add_header: 'X-Clacks-Overhead "GNU Terry Pratchett"' - - client_max_body_size: 128m + - client_max_body_size: 128m - - error_log: /var/log/nginx/matrix.error.log + - error_log: /var/log/nginx/matrix.error.log - - location /: - - return: 301 https://riot.kyriasis.com + - location /: + - return: 301 https://riot.kyriasis.com - - location /_matrix: - - proxy_pass: https://matrix_backend - - proxy_buffering: "off" - - proxy_set_header: X-Forwarded-For $remote_addr - - proxy_set_header: Host $host + - location /_matrix: + - proxy_pass: https://matrix_backend + - proxy_buffering: "off" + - proxy_set_header: X-Forwarded-For $remote_addr + - proxy_set_header: Host $host - - location /_synapse: - - proxy_pass: http://synapse_metrics - - proxy_buffering: "off" - - proxy_set_header: X-Forwarded-For $remote_addr - - proxy_set_header: Host $host - - proxy_http_version: 1.1 + - location /_synapse: + - proxy_pass: http://synapse_metrics + - proxy_buffering: "off" + - proxy_set_header: X-Forwarded-For $remote_addr + - proxy_set_header: Host $host + - proxy_http_version: 1.1 - - location /.well-known/acme-challenge: - - root: /srv/http/ + - location /.well-known/acme-challenge: + - root: /srv/http/ - - location /.well-known/matrix/client: - - proxy_pass: https://matrix_backend - - proxy_buffering: "off" - - proxy_set_header: X-Forwarded-For $remote_addr - - proxy_set_header: Host $host - - add_header: "'Access-Control-Allow-Origin' '*'" - - add_header: "'Access-Control-Allow-Methods' 'GET, PUT, POST, DELETE, HEAD, OPTIONS'" + - location /.well-known/matrix/client: + - proxy_pass: https://matrix_backend + - proxy_buffering: "off" + - proxy_set_header: X-Forwarded-For $remote_addr + - proxy_set_header: Host $host + - add_header: "'Access-Control-Allow-Origin' '*'" + - add_header: "'Access-Control-Allow-Methods' 'GET, PUT, POST, DELETE, HEAD, OPTIONS'" # vim: ft=yaml et: diff --git a/nginx/miniflux_kyriasis_com.sls b/nginx/miniflux_kyriasis_com.sls index 290c59f..b2d3a80 100644 --- a/nginx/miniflux_kyriasis_com.sls +++ b/nginx/miniflux_kyriasis_com.sls @@ -1,64 +1,63 @@ nginx: - ng: - servers: - managed: - miniflux.kyriasis.com: - enabled: True - config: - - server: - - server_name: miniflux.kyriasis.com - - listen: 80 - - listen: '[::]:80' + servers: + managed: + miniflux.kyriasis.com: + enabled: True + config: + - server: + - server_name: miniflux.kyriasis.com + - listen: 80 + - listen: '[::]:80' - - location /.well-known/acme-challenge: - - root: /srv/http/ + - location /.well-known/acme-challenge: + - root: /srv/http/ - - location /: - - return: '301 https://$server_name$request_uri' + - location /: + - return: '301 https://$server_name$request_uri' - - server: - - server_name: miniflux.kyriasis.com - - listen: 443 ssl http2 - - listen: '[::]:443 ssl http2' + - server: + - server_name: miniflux.kyriasis.com + - listen: 443 ssl http2 + - listen: '[::]:443 ssl http2' - - ssl: 'on' - - ssl_certificate: /etc/letsencrypt/live/miniflux.kyriasis.com/fullchain.pem - - ssl_certificate_key: /etc/letsencrypt/live/miniflux.kyriasis.com/privkey.pem - - ssl_dhparam: /etc/nginx/dhparam.pem + - ssl: 'on' + - ssl_certificate: /etc/letsencrypt/live/miniflux.kyriasis.com/fullchain.pem + - ssl_certificate_key: /etc/letsencrypt/live/miniflux.kyriasis.com/privkey.pem + - ssl_dhparam: /etc/nginx/dhparam.pem - - ssl_stapling: 'on' - - ssl_stapling_verify: 'on' - - ssl_trusted_certificate: /etc/letsencrypt/live/miniflux.kyriasis.com/fullchain.pem + - ssl_stapling: 'on' + - ssl_stapling_verify: 'on' + - ssl_trusted_certificate: /etc/letsencrypt/live/miniflux.kyriasis.com/fullchain.pem - # https://developer.mozilla.org/en-US/docs/Security/HTTP_Strict_Transport_Security - - add_header: 'Strict-Transport-Security "max-age=31536000"' + # https://developer.mozilla.org/en-US/docs/Security/HTTP_Strict_Transport_Security + - add_header: 'Strict-Transport-Security "max-age=31536000"' - # Tell browsers not to render the page inside a frame, and avoid clickjacking. - - add_header: X-Frame-Options SAMEORIGIN + # Tell browsers not to render the page inside a frame, and avoid clickjacking. + - add_header: X-Frame-Options SAMEORIGIN - # Tell browsers to not try to auto-detect the Content-Type. - - add_header: X-Content-Type-Options nosniff + # Tell browsers to not try to auto-detect the Content-Type. + - add_header: X-Content-Type-Options nosniff - # Enable the Cross-site scripting filter in most recent browsers. - # Normally enabled by default, but enable it anyway if user has disabled it. - - add_header: 'X-XSS-Protection "1; mode=block"' + # Enable the Cross-site scripting filter in most recent browsers. + # Normally enabled by default, but enable it anyway if user has disabled it. + - add_header: 'X-XSS-Protection "1; mode=block"' - # http://www.gnuterrypratchett.com/ - - add_header: 'X-Clacks-Overhead "GNU Terry Pratchett"' + # http://www.gnuterrypratchett.com/ + - add_header: 'X-Clacks-Overhead "GNU Terry Pratchett"' - - client_max_body_size: 128m + - client_max_body_size: 128m - - error_log: /var/log/nginx/miniflux.error.log + - error_log: /var/log/nginx/miniflux.error.log - - location /: - - proxy_pass: http://127.0.0.1:8080 - - proxy_redirect: 'off' - - proxy_set_header: X-Real-IP $remote_addr - - proxy_set_header: X-Forwarded-For $proxy_add_x_forwarded_for - - proxy_set_header: X-Forwarded-Host $server_name + - location /: + - proxy_pass: http://127.0.0.1:8080 + - proxy_redirect: 'off' + - proxy_set_header: X-Real-IP $remote_addr + - proxy_set_header: X-Forwarded-For $proxy_add_x_forwarded_for + - proxy_set_header: X-Forwarded-Host $server_name - - location /.well-known/acme-challenge: - - root: /srv/http/ + - location /.well-known/acme-challenge: + - root: /srv/http/ # vim: ft=yaml et: diff --git a/nginx/remmy_io.sls b/nginx/remmy_io.sls index d240e98..d8d36c6 100644 --- a/nginx/remmy_io.sls +++ b/nginx/remmy_io.sls @@ -1,60 +1,59 @@ nginx: - ng: - servers: - managed: - remmy.io: - enabled: True - config: - - server: - - server_name: remmy.io - - listen: 80 - - listen: '[::]:80' + servers: + managed: + remmy.io: + enabled: True + config: + - server: + - server_name: remmy.io + - listen: 80 + - listen: '[::]:80' - - location /.well-known/acme-challenge: - - root: /srv/http + - location /.well-known/acme-challenge: + - root: /srv/http - - location /: - - return: '301 https://$server_name$request_uri' + - location /: + - return: '301 https://$server_name$request_uri' - - server: - - server_name: remmy.io - - listen: 443 ssl http2 - - listen: '[::]:443 ssl http2' + - server: + - server_name: remmy.io + - listen: 443 ssl http2 + - listen: '[::]:443 ssl http2' - - ssl: 'on' - - ssl_certificate: /etc/letsencrypt/live/remmy.io/fullchain.pem - - ssl_certificate_key: /etc/letsencrypt/live/remmy.io/privkey.pem - - ssl_dhparam: /etc/nginx/dhparam.pem + - ssl: 'on' + - ssl_certificate: /etc/letsencrypt/live/remmy.io/fullchain.pem + - ssl_certificate_key: /etc/letsencrypt/live/remmy.io/privkey.pem + - ssl_dhparam: /etc/nginx/dhparam.pem - - ssl_stapling: 'on' - - ssl_stapling_verify: 'on' - - ssl_trusted_certificate: /etc/letsencrypt/live/remmy.io/fullchain.pem + - ssl_stapling: 'on' + - ssl_stapling_verify: 'on' + - ssl_trusted_certificate: /etc/letsencrypt/live/remmy.io/fullchain.pem - # https://developer.mozilla.org/en-US/docs/Security/HTTP_Strict_Transport_Security - - add_header: 'Strict-Transport-Security "max-age=31536000"' + # https://developer.mozilla.org/en-US/docs/Security/HTTP_Strict_Transport_Security + - add_header: 'Strict-Transport-Security "max-age=31536000"' - # Tell browsers not to render the page inside a frame, and avoid clickjacking. - - add_header: X-Frame-Options SAMEORIGIN + # Tell browsers not to render the page inside a frame, and avoid clickjacking. + - add_header: X-Frame-Options SAMEORIGIN - # Tell browsers to not try to auto-detect the Content-Type. - - add_header: X-Content-Type-Options nosniff + # Tell browsers to not try to auto-detect the Content-Type. + - add_header: X-Content-Type-Options nosniff - # Enable the Cross-site scripting filter in most recent browsers. - # Normally enabled by default, but enable it anyway if user has disabled it. - - add_header: 'X-XSS-Protection "1; mode=block"' + # Enable the Cross-site scripting filter in most recent browsers. + # Normally enabled by default, but enable it anyway if user has disabled it. + - add_header: 'X-XSS-Protection "1; mode=block"' - # http://www.gnuterrypratchett.com/ - - add_header: 'X-Clacks-Overhead "GNU Terry Pratchett"' + # http://www.gnuterrypratchett.com/ + - add_header: 'X-Clacks-Overhead "GNU Terry Pratchett"' - - error_log: /var/log/nginx/remmy_io.error.log + - error_log: /var/log/nginx/remmy_io.error.log - - root: /home/kyrias/public_html/ - - index: index.html - - autoindex: 'on' - - try_files: $uri $uri.html $uri/ =404 + - root: /home/kyrias/public_html/ + - index: index.html + - autoindex: 'on' + - try_files: $uri $uri.html $uri/ =404 - - location ~ \.(js|css|png): - - expires: modified +7d + - location ~ \.(js|css|png): + - expires: modified +7d # vim: ft=yaml et: diff --git a/nginx/repsys_kyriasis_com.sls b/nginx/repsys_kyriasis_com.sls index 3b8b548..e2e7a65 100644 --- a/nginx/repsys_kyriasis_com.sls +++ b/nginx/repsys_kyriasis_com.sls @@ -1,59 +1,58 @@ nginx: - ng: - servers: - managed: - repsys.kyriasis.com: - enabled: True - config: - - server: - - server_name: repsys.kyriasis.com - - listen: 80 - - listen: '[::]:80' + servers: + managed: + repsys.kyriasis.com: + enabled: True + config: + - server: + - server_name: repsys.kyriasis.com + - listen: 80 + - listen: '[::]:80' - - location /.well-known/acme-challenge: - - root: /srv/http + - location /.well-known/acme-challenge: + - root: /srv/http - - location /: - - return: '301 https://$server_name$request_uri' + - location /: + - return: '301 https://$server_name$request_uri' - - server: - - server_name: repsys.kyriasis.com - - listen: 443 ssl http2 - - listen: '[::]:443 ssl http2' + - server: + - server_name: repsys.kyriasis.com + - listen: 443 ssl http2 + - listen: '[::]:443 ssl http2' - - ssl: 'on' - - ssl_certificate: /etc/letsencrypt/live/repsys.kyriasis.com/fullchain.pem - - ssl_certificate_key: /etc/letsencrypt/live/repsys.kyriasis.com/privkey.pem - - ssl_dhparam: /etc/nginx/dhparam.pem + - ssl: 'on' + - ssl_certificate: /etc/letsencrypt/live/repsys.kyriasis.com/fullchain.pem + - ssl_certificate_key: /etc/letsencrypt/live/repsys.kyriasis.com/privkey.pem + - ssl_dhparam: /etc/nginx/dhparam.pem - - ssl_stapling: 'on' - - ssl_stapling_verify: 'on' - - ssl_trusted_certificate: /etc/letsencrypt/live/repsys.kyriasis.com/fullchain.pem + - ssl_stapling: 'on' + - ssl_stapling_verify: 'on' + - ssl_trusted_certificate: /etc/letsencrypt/live/repsys.kyriasis.com/fullchain.pem - # https://developer.mozilla.org/en-US/docs/Security/HTTP_Strict_Transport_Security - - add_header: 'Strict-Transport-Security "max-age=31536000"' + # https://developer.mozilla.org/en-US/docs/Security/HTTP_Strict_Transport_Security + - add_header: 'Strict-Transport-Security "max-age=31536000"' - # Tell browsers not to render the page inside a frame, and avoid clickjacking. - - add_header: X-Frame-Options SAMEORIGIN + # Tell browsers not to render the page inside a frame, and avoid clickjacking. + - add_header: X-Frame-Options SAMEORIGIN - # Tell browsers to not try to auto-detect the Content-Type. - - add_header: X-Content-Type-Options nosniff + # Tell browsers to not try to auto-detect the Content-Type. + - add_header: X-Content-Type-Options nosniff - # Enable the Cross-site scripting filter in most recent browsers. - # Normally enabled by default, but enable it anyway if user has disabled it. - - add_header: 'X-XSS-Protection "1; mode= |