diff --git a/nginx/files/matrix.conf b/nginx/files/matrix.conf deleted file mode 100644 index 20f5800..0000000 --- a/nginx/files/matrix.conf +++ /dev/null @@ -1,16 +0,0 @@ -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - - server_name chat.noveria.org; - - location ~ ^(/_matrix|/_synapse/client) { - proxy_pass http://localhost:8007; - proxy_set_header X-Forwarded-For $remote_addr; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header Host $host; - - client_max_body_size 50M; - proxy_http_version 1.1; - } -} diff --git a/nginx/files/nginx.conf.jinja b/nginx/files/nginx.conf.jinja deleted file mode 100644 index 1e22680..0000000 --- a/nginx/files/nginx.conf.jinja +++ /dev/null @@ -1,52 +0,0 @@ -## THIS FILE IS MANAGED USING SALT (state: {{ sls }}) -# /etc/nginx/nginx.conf - -qworker_processes auto; -pcre_jit on; - -error_log {{ log_dir }}/error.log warn; - -include /etc/nginx/modules/*.conf; -include /etc/nginx/conf.d/*.conf; - -events { - worker_connections 1024; -} - -http { - include /etc/nginx/mime.types; - default_type application/octet-stream; - - server_tokens off; - - client_max_body_size 1m; - - sendfile on; - - tcp_nopush on; - - ssl_protocols TLSv1.2 TLSv1.3; - - ssl_prefer_server_ciphers on; - - ssl_session_cache shared:SSL:2m; - - ssl_session_timeout 1h; - - ssl_session_ticketrs off; - - gzip_vary on; - - map $http_upgrade $connection_upgrade { - default upgrade; - '' close; - } - - log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - '$status $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - - access_log {{ log_dir }}/access.log main; - - include {{ sites_enabled_dir }}/*.conf; -} diff --git a/nginx/init.sls b/nginx/init.sls deleted file mode 100644 index d419d97..0000000 --- a/nginx/init.sls +++ /dev/null @@ -1,4 +0,0 @@ -include: - - .pkg - - .service - - .profiles diff --git a/nginx/map.jinja b/nginx/map.jinja deleted file mode 100644 index 9483817..0000000 --- a/nginx/map.jinja +++ /dev/null @@ -1,7 +0,0 @@ -{% set dir = '/etc/nginx' %} - -{% set nginx = { - 'log_dir': '/var/log/nginx', - 'sites_dir': '%s/sites-available' % dir, - 'sites_enabled_dir': '%s/sites-enabled' % dir -}%} diff --git a/nginx/pkg.sls b/nginx/pkg.sls deleted file mode 100644 index 3f95ef6..0000000 --- a/nginx/pkg.sls +++ /dev/null @@ -1,18 +0,0 @@ -{% from tpldir+"/map.jinja" import nginx with context %} - -nginx_pkg_pkgs: - pkg.installed: - - pkgs: - - nginx - -nginx_pkg_config: - file.managed: - - name: /etc/nginx/nginx.conf - - source: salt://{{ tpldir }}/files/nginx.conf.jinja - - template: jinja - - context: - sls: {{ sls }} - log_dir: {{ nginx.log_dir }} - sites_enabled_dir: {{ nginx.sites_enabled_dir }} - - require: - - nginx_pkg_pkgs diff --git a/nginx/profiles.sls b/nginx/profiles.sls deleted file mode 100644 index 8fac9ad..0000000 --- a/nginx/profiles.sls +++ /dev/null @@ -1,46 +0,0 @@ -{% from tpldir+"/map.jinja" import nginx with context %} -{% set profiles = salt.pillar.get("nginx.profiles", []) %} - -include: - - .pkg - -nginx_profiles_sites_dir: - file.directory: - - name: {{ nginx.sites_dir }} - - user: root - - group: root - - file_mode: '0644' - - dir_mode: '0755' - - require: - - nginx_pkg_pkgs - -nginx_profiles_sites_enabled_dir: - file.directory: - - name: {{ nginx.sites_enabled_dir }} - - user: root - - group: root - - file_mode: '0644' - - dir_mode: '0755' - - require: - - nginx_pkg_pkgs - -{% for profile in profiles %} -nginx_{{ profile }}_config: - file.managed: - - name: {{ nginx.sites_dir }}/{{ profile }}.conf - - source: salt://{{ tpldir }}/files/{{ profile }}.conf - - user: root - - group: root - - mode: '0644' - - require: - - nginx_profiles_sites_dir - - nginx_profiles_sites_enabled_dir - -nginx_{{ profile }}}_enable: - file.symlink: - - name: {{ nginx.sites_enabled_dir }}/{{ profile }}.conf - - target: {{ nginx.sites_dir }}/{{ profile }}.conf - - force: True - - require: - - nginx_{{ profile }}_config -{% endfor %} diff --git a/nginx/service.sls b/nginx/service.sls deleted file mode 100644 index 1185ec1..0000000 --- a/nginx/service.sls +++ /dev/null @@ -1,9 +0,0 @@ -include: - - .pkg - -nginx_service_running: - service.running: - - name: nginx - - enable: True - - require: - - nginx_pkg_pkgs