Merge branch 'master' of git.disroot.org:Disroot-Ansible/nginx

defaults/main.yml

@@ -15,7 +15,6 @@ nginx_log_dir: '/var/log/nginx'
 nginx_events_use: 'epoll'
 nginx_www_dir: '/var/www/'
 nginx_HSTS_policy: 'false'
-nginx_hsts_age: '63072000'
 nginx_http_types_hash_max_size: 4096
 nginx_http_default_type: 'application/octet-stream'
 nginx_http_access_log: 'off'
@@ -48,17 +47,6 @@ nginx_http_gzip_types: 'text/plain text/css application/json application/x-javas
 nginx_http_gzip_vary: 'on'
 nginx_http_gzip_disable: '"msie6"'
 
-## Self signed certificates
-nginx_selfsigned_deps:
-    - build-essential
-    - libssl-dev
-    - libffi-dev
-    - python-dev
-    - git
-    - dialog
-    - libaugeas0
-    - ca-certificates
-
 nginx_gen_dh: 'false'
 nginx_dh_path: '{{ nginx_ssl_dir }}/dhparam.pem'
 nginx_dh_length: 4096
@@ -75,11 +63,3 @@ letsencrypt_copy_certs: 'false'
 letsencrypt_copy_cert_from:
   - name: ''
     letsencrypt_dest: ''
-
-# TOR
-enable_tor: 'false'
-tor_apt:
-  - apt-transport-https
-  - tor
-  - deb.torproject.org-keyring
-tor_server_names_hash_bucket_size: 128

handlers/main.yml

@@ -9,8 +9,3 @@
   systemd:
     name: nginx
     state: reloaded
-
-- name: restart tor
-  systemd:
-    name: tor
-    state: restarted

tasks/main.yml

@@ -1,25 +1,13 @@
 ---
 
 - name: "[NGINX] - Install packages"
-  include_tasks: install.yml
+  include: install.yml
 
 - name: "[NGINX] - Configure nginx"
-  include_tasks: config.yml
+  include: config.yml
 
 - name: "[NGINX] - Set SSL configuration"
-  include_tasks: ssl.yml
+  include: ssl.yml
-
-- name: '[NGINX] - Deploy TOR for onion hidden services'
-  include_tasks: tor.yml
-  when: enable_tor == 'true'
-
-- name: '[NGINX] - Create onion addresses'
-  include_tasks: 'onion_vhost.yml'
-  when: enable_tor == 'true'
-  loop: '{{ nginx_vhosts }}'
 
 - name: "[NGINX] - Create Vhosts configuration"
-  include_tasks: vhost.yml
+  include: vhost.yml
-  loop: '{{ nginx_vhosts }}'
-  
-

tasks/onion_vhost.yml

@@ -1,43 +0,0 @@
----
-
-- name: '[ONION] - register onion address for {{ item.name }}'
-  slurp:
-    src: "/var/lib/tor/{{ item.name }}/hostname"
-  register: "onion_address"
-  when: item.state is defined and item.onion is defined and item.onion == 'true'
-
-- name: "[ONION] - Create vhosts for {{ item.name }}"
-  template:
-    src: etc/nginx/sites-available/{{ item.template }}.j2
-    dest: "{{ nginx_etc_dir }}/sites-available/{{ item.name }}.onion"
-  notify:
-      - reload nginx
-  when: item.state is defined and item.onion is defined and item.onion == 'true'
-
-- name: "[ONION] - Delete vhosts for {{ item.name }}"
-  file:
-    path: "{{ nginx_etc_dir }}/sites-available/{{ item.name }}.onion"
-    state: absent
-  notify:
-      - reload nginx
-  when: item.state is defined and item.state == 'delete' and item.onion is defined and item.onion == 'true'
-
-
-- name: "[ONION] - Enable vhosts for {{ item.name }}"
-  file:
-    src: "{{ nginx_etc_dir }}/sites-available/{{ item.name }}.onion"
-    dest: "{{ nginx_etc_dir }}/sites-enabled/{{ item.name }}.onion"
-    state: link
-  notify:
-      - reload nginx
-  when: item.state is defined and item.state == 'enable' and item.onion is defined and item.onion == 'true'
-
-
-- name: "[ONION] - Disable vhosts for {{ item.name }}"
-  file:
-    path: "{{ nginx_etc_dir}}/sites-enabled/{{ item.name }}.onion"
-    state: absent
-  notify:
-      - reload nginx
-  when: item.state is defined and (item.state == 'disable' or item.state == 'delete') and item.onion is defined and item.onion == 'true'
-

tasks/ssl.yml

@@ -22,7 +22,7 @@
   notify:
     - reload nginx
 
-- name: "[NGINX] - Create SSL keys subfolder for {{ item.name }}"
+- name: "[NGINX] - Create SSL keys subfolder"
   file:
     path: "{{ nginx_ssl_dir }}/{{ item.ssl_name }}"
     state: directory
@@ -31,7 +31,7 @@
   when: item.copy_ssl is defined
   notify: reload nginx
 
-- name: "[NGINX] - Deploy SSL keys for {{ item.name }}"
+- name: "[NGINX] - Deploy SSL keys"
   copy:
     src: "{{ ssl_src_path }}/{{ item.ssl_name }}/privkey.pem"
     dest: "{{ nginx_ssl_dir}}/{{ item.ssl_name }}/privkey.pem"
@@ -40,7 +40,7 @@
   when: item.copy_ssl is defined
   notify: reload nginx
 
-- name: "[NGINX] - Deploy SSL certs for {{ item.name }}"
+- name: "[NGINX] - Deploy SSL certs"
   copy:
     src: "{{ ssl_src_path }}/{{ item.ssl_name }}/fullchain.pem"
     dest: "{{ nginx_ssl_dir}}/{{ item.ssl_name }}/fullchain.pem"
@@ -49,28 +49,7 @@
   when: item.copy_ssl is defined
   notify: reload nginx
 
-- name: "[SELFSIGNED] - Install dependencies"
+- name: "[SELFSIGNED] - Create Key folder"
-  apt:
-    name: "{{ item }}"
-    state: present
-  with_items: "{{ nginx_selfsigned_deps }}"
-  when: item.selfsigned is defined and item.selfsigned == 'true'
-
-- name: "[SELFSIGNED] - Add python2 cryptography module"
-  apt:
-    name: python-cryptography
-    state: present
-  with_items: "{{ nginx_vhosts }}"
-  when: item.selfsigned is defined and item.selfsigned == 'true' and ansible_python.executable == '/usr/bin/python'
-
-- name: "[SELFSIGNED] - Add python3 cryptography module"
-  apt:
-    name: python3-cryptography
-    state: present
-  with_items: "{{ nginx_vhosts }}"
-  when: item.selfsigned is defined and item.selfsigned == 'true' and ansible_python.executable == '/usr/bin/python3'
-
-- name: "[SELFSIGNED] - Create Key folder for {{ item.name }}"
   file:
     path: "{{ nginx_ssl_dir }}/{{ item.ssl_name }}"
     state: directory
@@ -78,30 +57,31 @@
   with_items: "{{ nginx_vhosts }}"
   when: item.selfsigned is defined and item.selfsigned == 'true'
   notify: reload nginx
+  
 
-- name: '[SELFSIGNED] - Create a self-signed key for {{ item.name }}'
+- name: '[SELFSIGNED] - Create a self-signed key'
   openssl_privatekey:
-    path:  '{{ ssl_src_path }}/{{ item.ssl_name }}/privkey.pem'
+    path:  '{{ ssl_src_path }}/{{ item.ssl_name }}/privkey.pem'                       
-    size: 2048
+    size: 2048                                                                                          
-    type: RSA
+    type: RSA 
   with_items: "{{ nginx_vhosts }}"
   when: item.selfsigned is defined and item.state == 'enable' and item.selfsigned == 'true'
   notify: reload nginx
 
-- name: '[SELFSIGNED] - Generate OpenSSL Certificate Signing Request (CSR) for {{ item.name }}'
+- name: '[SELFSIGNED] - Generate OpenSSL Certificate Signing Request (CSR)'                                  
-  openssl_csr:
+  openssl_csr:                                                                                          
-    path:  '{{ ssl_src_path }}/{{ item.ssl_name }}/selfsigned.crs'
+    path:  '{{ ssl_src_path }}/{{ item.ssl_name }}/selfsigned.crs'                                                           
-    privatekey_path:  '{{ ssl_src_path }}/{{ item.ssl_name }}/privkey.pem'
+    privatekey_path:  '{{ ssl_src_path }}/{{ item.ssl_name }}/privkey.pem'                                               
   with_items: "{{ nginx_vhosts }}"
   when: item.selfsigned is defined and item.state == 'enable' and item.selfsigned == 'true'
   notify: reload nginx
 
-- name: '[SELFSIGNED] - Create a self-signed certificate for {{ item.name }}'
+- name: '[SELFSIGNED] - Create a self-signed certificate'                                                    
-  openssl_certificate:
+  openssl_certificate:                                                                                  
-    path:  '{{ ssl_src_path }}/{{ item.ssl_name }}/fullchain.pem'
+    path:  '{{ ssl_src_path }}/{{ item.ssl_name }}/fullchain.pem'                                                           
-    privatekey_path:  '{{ ssl_src_path }}/{{ item.ssl_name }}/privkey.pem'
+    privatekey_path:  '{{ ssl_src_path }}/{{ item.ssl_name }}/privkey.pem'                                              
-    csr_path:  '{{ ssl_src_path }}/{{ item.ssl_name }}/selfsigned.crs'
+    csr_path:  '{{ ssl_src_path }}/{{ item.ssl_name }}/selfsigned.crs'                                                       
     provider: selfsigned
   with_items: "{{ nginx_vhosts }}"
-  when: item.selfsigned is defined and item.state == 'enable' and item.selfsigned == 'true'
+  when: item.selfsigned is defined and item.state == 'enable' and item.selfsigned == 'true' 
   notify: reload nginx

tasks/tor.yml

@@ -1,42 +0,0 @@
----
-
-
-- name: '[TOR INSTALLDEPS] - Add torproject apt key'
-  apt_key:
-    url: https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc
-    keyring: /usr/share/keyrings/tor-archive-keyring.gpg
-    state: present
-
-- name: '[TOR INSTALLDEPS] - Add repository for torproject'
-  apt_repository:
-    repo: deb [signed-by=/usr/share/keyrings/tor-archive-keyring.gpg] https://deb.torproject.org/torproject.org {{ ansible_distribution_release }} main
-    state: present
-    filename: 'tor'
-
-- name: '[TOR INSTALLDEPS] - Add repository for torproject'
-  apt_repository:
-    repo: deb-src [signed-by=/usr/share/keyrings/tor-archive-keyring.gpg] https://deb.torproject.org/torproject.org {{ ansible_distribution_release }} main
-    state: present
-    filename: 'tor'
-
-- name: '[TOR INSTALLDEPS] - Install dependencies'
-  apt:
-    name: "{{ tor_apt }}"
-    update_cache: yes
-
-
-- name: '[TOR CONFIGURE] - Deploy tor config'
-  template:
-    src: etc/tor/torrc.j2
-    dest: "/etc/tor/torrc"
-    owner: root
-    group: root
-    mode: 0644
-  notify:
-    restart tor
-
-- name: Restart tor
-  systemd:
-    name: tor
-    state: restarted
-

tasks/vhost.yml

@@ -1,92 +1,41 @@
 ---
-- name: '[ONION] - register onion address for {{ item.name }}'
-  slurp:
-    src: "/var/lib/tor/{{ item.name }}/hostname"
-  register: "onion_address"
-  when:  
-    - item.onion is defined 
-    - item.onion == 'true'
 
-- name: "[NGINX] - Set fact"
+- name: "[NGINX] - Create vhosts"
-  set_fact:
-    enable_tor: 'false'
-    
-- name: "[NGINX] - Check if the certificate for the vhost exists for {{ item.name }}"
-  stat:
-    path: '{{ nginx_ssl_dir }}/{{ item.ssl_name }}/privkey.pem'
-  register: cert_exists
-  when:
-    - item.ssl_name is defined
-
-- name: "[NGINX] - Create HTTPS vhosts for {{ item.name }}"
   template:
     src: etc/nginx/sites-available/{{ item.template }}.j2
     dest: "{{ nginx_etc_dir }}/sites-available/{{ item.name }}"
+  with_items: "{{ nginx_vhosts }}"
   notify:
       - reload nginx
-  when: 
+  when: item.state is defined and item.state != 'delete'
-    - item.ssl_name is defined
-    - cert_exists is defined
-    - cert_exists.stat.exists 
-    - item.state is defined 
-    - item.state != 'delete'
 
-- name: "[NGINX] - Create HTTP vhosts for {{ item.name }}"
+- name: "[NGINX] - Delete vhosts"
-  template:
-    src: etc/nginx/sites-available/{{ item.template }}.j2
-    dest: "{{ nginx_etc_dir }}/sites-available/{{ item.name }}"
-  notify:
-      - reload nginx
-  when: 
-    - item.ssl_name is not defined
-    - item.state is defined 
-    - item.state != 'delete'
-
-- name: "[NGINX] - Delete vhosts for {{ item.name }}"
   file:
     path: "{{ nginx_etc_dir }}/sites-available/{{ item.name }}"
     state: absent
+  with_items: "{{ nginx_vhosts }}"
   notify:
       - reload nginx
-  when: 
+  when: item.state is defined and item.state == 'delete'
-    - item.state is defined
-    - item.state == 'delete'
 
-- name: "[NGINX] - Enable HTTPS vhosts for {{ item.name }}"
+- name: "[NGINX] - Enable vhosts"
   file:
     src: "{{ nginx_etc_dir }}/sites-available/{{ item.name }}"
     dest: "{{ nginx_etc_dir }}/sites-enabled/{{ item.name }}"
     state: link
+  with_items: "{{ nginx_vhosts }}"
   notify:
       - reload nginx
-  when:
+  when: item.state is defined and item.state == 'enable'
-    - item.ssl_name is defined
-    - cert_exists is defined
-    - cert_exists.stat.exists
-    - item.state is defined
-    - item.state == 'enable'
 
-- name: "[NGINX] - Enable HTTP vhosts for {{ item.name }}"
+- name: "[NGINX] - Disable vhosts"
-  file:
-    src: "{{ nginx_etc_dir }}/sites-available/{{ item.name }}"
-    dest: "{{ nginx_etc_dir }}/sites-enabled/{{ item.name }}"
-    state: link
-  notify:
-      - reload nginx
-  when:
-    - item.ssl_name is not defined 
-    - item.state is defined
-    - item.state == 'enable'
-
-- name: "[NGINX] - Disable vhosts for {{ item.name }}"
   file:
     path: "{{ nginx_etc_dir}}/sites-enabled/{{ item.name }}"
     state: absent
+  with_items: "{{ nginx_vhosts }}"
   notify:
       - reload nginx
-  when: 
+  when: item.state is defined and (item.state == 'disable' or item.state == 'delete')
-    - item.state is defined
-    - item.state == 'disable' or item.state == 'delete'
 
 - name: "[NGINX] - Delete default vhost when explicitely defined"
   file:
@@ -95,31 +44,3 @@
   notify:
     - reload nginx
   when: nginx_default_vhost is not none
-
-- name: "[NGINX] - Create HTTPS maintenance vhosts for {{ item.name }}"
-  template:
-    src: etc/nginx/sites-available/maintenance.j2
-    dest: "{{ nginx_etc_dir }}/sites-available/maintenance-{{ item.name }}"
-  notify:
-      - reload nginx
-  when: 
-    - item.ssl_name is defined
-    - cert_exists is defined
-    - cert_exists.stat.exists
-    - item.state is defined
-    - item.state != 'delete'
-    - item.maintenance is defined
-    - item.maintenance == 'true' 
-
-- name: "[NGINX] - Create HTTP maintenance vhosts for {{ item.name }}"
-  template:
-    src: etc/nginx/sites-available/maintenance.j2
-    dest: "{{ nginx_etc_dir }}/sites-available/maintenance-{{ item.name }}"
-  notify:
-      - reload nginx
-  when: 
-    - item.ssl_name is not defined
-    - item.state is defined
-    - item.state != 'delete'
-    - item.maintenance is defined
-    - item.maintenance == 'true' 

templates/etc/nginx/nginx.conf.j2

@@ -18,9 +18,7 @@ events {
 http {
   types_hash_max_size {{ nginx_http_types_hash_max_size }};
   include {{ nginx_etc_dir }}/mime.types;
-{% if enable_tor == 'true' %}
+
-  server_names_hash_bucket_size {{ tor_server_names_hash_bucket_size }};
-{% endif %}
   default_type {{ nginx_http_default_type }};
   access_log {{ nginx_http_access_log }};
   error_log {{ nginx_http_error_log }};

templates/etc/nginx/sites-available/akaunting.j2

@@ -1,44 +0,0 @@
-{% extends "core.j2" %}
-
-{% block  location %}
-
-    root {{ item.root }};
-
-    index index.html index.htm index.php;
-
-    charset utf-8;
-
-    location / {
-        try_files $uri $uri/ /index.php?$query_string;
-    }
-
-    # Prevent Direct Access To Protected Files
-    location ~ \.(env|log) {
-        deny all;
-    }
-
-    # Prevent Direct Access To Protected Folders
-    location ~ ^/(^app$|bootstrap|config|database|overrides|resources|routes|storage|tests|artisan) {
-        deny all;
-    }
-
-    # Prevent Direct Access To modules/vendor Folders Except Assets
-    location ~ ^/(modules|vendor)\/(.*)\.((?!ico|gif|jpg|jpeg|png|js\b|css|less|sass|font|woff|woff2|eot|ttf|svg).)*$ {
-        deny all;
-    }
-
-    error_page 404 /index.php;
-
-    # Pass PHP Scripts To FastCGI Server
-    location ~ \.php$ {
-        fastcgi_split_path_info ^(.+\.php)(/.+)$;
-        fastcgi_pass unix:/var/run/php/php{{ php_version }}-fpm.sock; # Depends On The PHP Version
-        fastcgi_index index.php;
-        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-        include fastcgi_params;
-    }
-
-    location ~ /\.(?!well-known).* {
-        deny all;
-    }
-{% endblock %}

templates/etc/nginx/sites-available/basephp.j2

@@ -1,46 +0,0 @@
-{% extends "core.j2" %}
-
-{% block root %}
-  root {{ nginx_www_dir }}{{ item.root }};
-  index {{ item.index }};
-{% endblock %}
-
-{% block location %}
-  location / {
-    try_files {{ item.override_try_files | default('$uri $uri/ =404') }};
-  }
-{% endblock %}
-
-{% block local_content %}
-{% if item.manage_local_content is not defined %}
-  # Deny all attempts to access hidden files such as .htaccess, .htpasswd, .DS_Store (Mac).
-  # Keep logging the requests to parse later (or to pass to firewall utilities such as fail2ban)
-  location ~ /\. {
-    deny all;
-  }
-
-{% if item.favicon is defined %}
-  location /favicon.ico {
-    alias {{ item.favicon }};
-    expires 30d;
-    access_log off;
-    log_not_found off;
-  }
-{% endif %}
-
-  location ~* \.(txt|js|css|png|jpe?g|gif|ico|svg)$ {
-    expires 30d;
-    log_not_found off;
-  }
-{% endif %}
-{% endblock %}
-{% block app_specific %}
-  location ~ \.php$ {
-{% if item.upstream_params is defined and item.upstream_params is iterable %}
-{% for param in item.upstream_params %}
-    {{ param }}
-{% endfor %}
-{% endif %}
-  }
-{% endblock %}
-

templates/etc/nginx/sites-available/core.j2

@@ -8,11 +8,6 @@
 
 {% block server_info %}
 ## SERVER INFO
-{% if item.onion is defined and enable_tor == 'true' and onion_address | length > 0 %}
-server {
-  listen unix:/var/run/{{ item.name }}.sock;
-  server_name {{ onion_address.content | b64decode | trim }};
-{% else %}
 server {
   server_name {% if item.name is string %}{{ item.name }}{% else %}{{ item.name | join(' ') }}{% endif %};
 {% if item.proto == 'http' %}
@@ -32,7 +27,6 @@ server {
   {{ htpasswd(item.htpasswd, 1) }}
 {% endif %}
 {% endif %}
-{% endif %}
 {% endblock %}
 {% block root %}
 {% endblock %}
@@ -52,50 +46,53 @@ server {
 {% endblock %}
 
 {% block headers %}
-{% if enable_tor != 'true' and item.onion is defined and onion_address | length > 0 %}
-  add_header Onion-Location http://{{ onion_address.content | b64decode | trim }}$request_uri;
-{% endif %}
 {% if item.headers is defined and item.headers == 'none' %}
 {% else %}
 ## HEADERS
-{% if item.header_permission_policy is defined and item.header_permission_policy == 'none' %}
+{% if item.permission_policy is defined and item.permission_policy == 'none' %}
 {% else %}
   add_header Permissions-Policy "geolocation=(),interest-cohort=()";
 {% endif %}
-{% if item.secure_site is defined and item.secure_site == 'none' %}
+{% if item.secure_site is defined %}
-{% else %}
   add_header X-Download-Options noopen;
   add_header X-Permitted-Cross-Domain-Policies none;
+  add_header Referrer-Policy {{ item.referrer | default('no-referrer') }};
+{% if item.header_sameorigin is defined %}
+  add_header X-Frame-Options "SAMEORIGIN";
 {% endif %}
-{% if item.header_referrer is defined and item.header_referrer == 'none' %}
+{% endif %}
+{% if item.nginx_HSTS_policy is defined %}
+  add_header Strict-Transport-Security "max-age=63072000; includeSubDomains; preload";
+{% endif %}
+{% if item.referrer is defined %}
+  add_header Referrer-Policy no-referrer;
+{% endif %}
+{% if item.csp is defined %}
+  add_header Content-Security-Policy "{{ item.csp }}";
+{% endif %}
+{% if item.cto is defined %}
+{% if item.cto == 'none' %}
 {% else %}
-  add_header Referrer-Policy "{{ item.header_referrer | default('no-referrer') }}";
+  add_header X-Content-Type-Options {{ item.cto }};
 {% endif %}
-{% if item.header_xframe is defined and item.header_xframe == 'none' %}
 {% else %}
-  add_header X-Frame-Options "{{ item.header_xframe | default("SAMEORIGIN") }}";
+  add_header X-Content-Type-Options nosniff;
 {% endif %}
-{% if item.nginx_HSTS_policy is defined and item.nginx_HSTS_policy == 'none' %}
+{%if item.xss is defined %}
+{% if item.xss == 'none' %}
 {% else %}
-  add_header Strict-Transport-Security "max-age={{ nginx_hsts_age }}; includeSubDomains; preload;" always;
+  add_header X-XSS-Protection "{{ item.xss }}";
 {% endif %}
-{% if item.header_csp is defined %}
-  add_header Content-Security-Policy "{{ item.header_csp | default("default-src 'self'; script-src 'self'; connect-src 'self'; img-src 'self'; style-src 'self'; base-uri 'self'; form-action 'self';") }}";
-{% endif %}
-{% if item.header_cto is defined and item.header_cto == 'none' %}
 {% else %}
-  add_header X-Content-Type-Options "{{ item.header_cto | default('nosniff') }}";
+  add_header X-XSS-Protection "1; mode=block";
 {% endif %}
-{%if item.header_xss is defined and item.header_xss == 'none' %}
+{% if item.robots is defined %}
+{% if item.robots == 'none' %}
 {% else %}
-  add_header X-XSS-Protection "{{ item.header_xss | default('1; mode=block') }}";
+  add_header X-Robots-Tag "{{ item.robots }}";
 {% endif %}
-{% if item.header_robots is defined and item.header_robots == 'none' %}
 {% else %}
-  add_header X-Robots-Tag "{{ item.header_robots | default('none') }}";
+  add_header X-Robots-Tag none;
-{% endif %}
-{% if item.header_frame_ancestors is defined and item.header_frame_ancestors == 'true' %}
-  add_header Content-Security-Policy "frame-ancestors 'self';";
 {% endif %}
 {% endif %}
 {% endblock %}
@@ -113,21 +110,21 @@ server {
 {% for item in location.options %}
     {{ item }}
 {% endfor %}
-{% if location.headers is defined %}
+  {% if location.headers is defined %}
 {% for item in location.headers %}
 {% if item.secure_site is defined %}
   add_header X-Download-Options noopen;
   add_header X-Permitted-Cross-Domain-Policies none;
-{% endif %}
-{% if item.referrer is defined %}
   add_header Referrer-Policy {{ item.referrer | default('no-referrer') }};
-{% endif %}
 {% if item.header_sameorigin is defined %}
   add_header X-Frame-Options "SAMEORIGIN";
 {% endif %}
-
+{% endif %}
 {% if item.nginx_HSTS_policy is defined %}
-  add_header Strict-Transport-Security "max-age={{ nginx_hsts_age }}; includeSubDomains; preload;" always;
+  add_header Strict-Transport-Security "max-age=63072000; includeSubDomains; preload";
+{% endif %}
+{% if item.referrer is defined %}
+  add_header Referrer-Policy no-referrer;
 {% endif %}
 {% if item.csp is defined %}
   add_header Content-Security-Policy "{{ item.csp }}";
@@ -188,8 +185,7 @@ server {
   return 301 https://{{ item.name }}$request_uri;
 }
 {% endif %}
-
+{% if item.redirect_https is defined and item.redirect_https %}
-{% if item.redirect_https is defined and item.redirect_https and enable_tor != 'true' %}
 
 ## REDIRECTS
 

templates/etc/nginx/sites-available/cryptpad.j2

@@ -1,135 +1,92 @@
-# SPDX-FileCopyrightText: 2023 XWiki CryptPad Team <contact@cryptpad.org> and contributors
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
 {% extends "core.j2" %}
 
 {% block app_specific %}
+  # CryptPad serves static assets over these two domains.
+  # `main_domain` is what users will enter in their address bar.
+  # Privileged computation such as key management is handled in this scope
+  # UI content is loaded via the `sandbox_domain`.
+  # "Content Security Policy" headers prevent content loaded via the sandbox
+  # from accessing privileged information.
+  # These variables must be different to take advantage of CryptPad's sandboxing techniques.
+  # In the event of an XSS vulnerability in CryptPad's front-end code
+  # this will limit the amount of information accessible to attackers.
+  set $main_domain "{{ item.ssl_name }}";
+  set $sandbox_domain "sandbox.{{ item.ssl_name }}";
 
-    # Include mime.types to be able to support .mjs files (see "types" below)
+  # CryptPad's dynamic content (websocket traffic and encrypted blobs)
-    include mime.types;
+  # can be served over separate domains. Using dedicated domains (or subdomains)
+  # for these purposes allows you to move them to a separate machine at a later date
+  # if you find that a single machine cannot handle all of your users.
+  # If you don't use dedicated domains, this can be the same as $main_domain
+  # If you do, they'll be added as exceptions to any rules which block connections to remote domains.
+  set $api_domain "{{ item.ssl_name }}";
+  set $files_domain "{{ item.ssl_name }}";
 
-    # CryptPad serves static assets over these two domains.
+  add_header Access-Control-Allow-Origin "*";
-    # `main_domain` is what users will enter in their address bar.
-    # Privileged computation such as key management is handled in this scope
-    # UI content is loaded via the `sandbox_domain`.
-    # "Content Security Policy" headers prevent content loaded via the sandbox
-    # from accessing privileged information.
-    # These variables must be different to take advantage of CryptPad's sandboxing techniques.
-    # In the event of an XSS vulnerability in CryptPad's front-end code
-    # this will limit the amount of information accessible to attackers.
-    set $main_domain "{{ item.ssl_name }}";
-    set $sandbox_domain "sandbox.{{ item.ssl_name }}";
 
-    # By default CryptPad forbids remote domains from embedding CryptPad documents in iframes.
+  set $coop '';
-    # The sandbox domain must always be permitted in order for the platform to function.
+ if ($uri ~ ^\/(sheet|presentation|doc|convert)\/.*$) { set $coop 'same-origin'; }
-    # If you wish to enable remote embedding you may change the value below to "*"
-    # as per the commented value.
-    set $allowed_origins "https://${sandbox_domain}";
-    #set $allowed_origins "*";
 
-    # CryptPad's dynamic content (websocket traffic and encrypted blobs)
+  # Enable SharedArrayBuffer in Firefox (for .xlsx export)
-    # can be served over separate domains. Using dedicated domains (or subdomains)
+  add_header Cross-Origin-Resource-Policy cross-origin;
-    # for these purposes allows you to move them to a separate machine at a later date
+  add_header Cross-Origin-Opener-Policy $coop;
-    # if you find that a single machine cannot handle all of your users.
+  add_header Cross-Origin-Embedder-Policy require-corp;
-    # If you don't use dedicated domains, this can be the same as $main_domain
+  # any static assets loaded with "ver=" in their URL will be cached for a year
-    # If you do, they can be added as exceptions to any rules which block connections to remote domains.
+  if ($args ~ ver=) {
-    # You can find these variables referenced below in the relevant places
+    set $cacheControl max-age=31536000;
-    set $api_domain "{{ item.ssl_name }}";
+  }
-    set $files_domain "{{ item.ssl_name }}";
+  if ($uri ~ ^/.*(\/|\.html)$) {
+    set $cacheControl no-cache;
+  }
+  # Will not set any header if it is emptystring
+  add_header Cache-Control $cacheControl;
 
-    add_header Access-Control-Allow-Origin "${allowed_origins}";
+  # CSS can be dynamically set inline, loaded from the same domain, or from $main_domain
-    add_header Access-Control-Allow-Credentials true;
+  set $styleSrc   "'unsafe-inline' 'self' ${main_domain}";
-    # add_header X-Frame-Options "SAMEORIGIN";
 
-    # Opt out of Google's FLoC Network
+  # connect-src restricts URLs which can be loaded using script interfaces
-    add_header Permissions-Policy interest-cohort=();
+  set $connectSrc "'self' https://${main_domain} ${main_domain} https://${api_domain} blob: wss://${api_domain} ${api_domain} ${files_domain}";
 
-    # Enable SharedArrayBuffer in Firefox (for .xlsx export)
+  # fonts can be loaded from data-URLs or the main domain
-    add_header Cross-Origin-Resource-Policy cross-origin;
+  set $fontSrc    "'self' data: ${main_domain}";
-    add_header Cross-Origin-Embedder-Policy require-corp;
 
-    # any static assets loaded with "ver=" in their URL will be cached for a year
+  # images can be loaded from anywhere, though we'd like to deprecate this as it allows the use of images for tracking
-    if ($args ~ ver=) {
+  set $imgSrc     "'self' data: * blob: ${main_domain}";
-        set $cacheControl max-age=31536000;
-    }
-    # This rule overrides the above caching directive and makes things somewhat less efficient.
-    # We had inverted them as an optimization, but Safari 16 introduced a bug that interpreted
-    # some important headers incorrectly when loading these files from cache.
-    # This is why we can't have nice things :(
-    if ($uri ~ ^(\/|.*\/|.*\.html)$) {
-        set $cacheControl no-cache;
-    }
 
-    # Will not set any header if it is emptystring
+  # frame-src specifies valid sources for nested browsing contexts.
-    add_header Cache-Control $cacheControl;
+  # this prevents loading any iframes from anywhere other than the sandbox domain
+  set $frameSrc   "'self' ${sandbox_domain} blob:";
 
-    # CSS can be dynamically set inline, loaded from the same domain, or from $main_domain
+  # specifies valid sources for loading media using video or audio
-    set $styleSrc   "'unsafe-inline' 'self' https://${main_domain}";
+  set $mediaSrc   "'self' data: * blob: ${main_domain}";
 
-    # connect-src restricts URLs which can be loaded using script interfaces
+  # defines valid sources for webworkers and nested browser contexts
-    # if you have configured your instance to use a dedicated $files_domain or $api_domain
+  # deprecated in favour of worker-src and frame-src
-    # you will need to add them below as: https://${files_domain} and https://${api_domain}
+  set $childSrc   "https://${main_domain}";
-    set $connectSrc "'self' https://${main_domain} blob: wss://${api_domain} https://${sandbox_domain}";
 
-    # fonts can be loaded from data-URLs or the main domain
+  # specifies valid sources for Worker, SharedWorker, or ServiceWorker scripts.
-    set $fontSrc    "'self' data: https://${main_domain}";
+  # supercedes child-src but is unfortunately not yet universally supported.
+  set $workerSrc  "https://${main_domain}";
 
-    # images can be loaded from anywhere, though we'd like to deprecate this as it allows the use of images for tracking
+  # script-src specifies valid sources for javascript, including inline handlers
-    set $imgSrc     "'self' data: blob: https://${main_domain}";
+  set $scriptSrc  "'self' resource: ${main_domain}";
 
-    # frame-src specifies valid sources for nested browsing contexts.
+  set $unsafe 0;
-    # this prevents loading any iframes from anywhere other than the sandbox domain
+  # the following assets are loaded via the sandbox domain
-    set $frameSrc   "'self' https://${sandbox_domain} blob:";
+  # they unfortunately still require exceptions to the sandboxing to work correctly.
+  if ($uri ~ ^\/(sheet|doc|presentation)\/inner.html.*$) { set $unsafe 1; }
+  if ($uri ~ ^\/common\/onlyoffice\/.*\/index\.html.*$) { set $unsafe 1; }
 
-    # specifies valid sources for loading media using video or audio
+  # everything except the sandbox domain is a privileged scope, as they might be used to handle keys
-    set $mediaSrc   "blob:";
+  if ($host != $sandbox_domain) { set $unsafe 0; }
 
-    # defines valid sources for webworkers and nested browser contexts
+  # privileged contexts allow a few more rights than unprivileged contexts, though limits are still applied
-    # deprecated in favour of worker-src and frame-src
+  if ($unsafe) {
-    set $childSrc   "https://${main_domain}";
+    set $scriptSrc "'self' 'unsafe-eval' 'unsafe-inline' resource: ${main_domain}";
-
+  }
-    # specifies valid sources for Worker, SharedWorker, or ServiceWorker scripts.
-    # supercedes child-src but is unfortunately not yet universally supported.
-    set $workerSrc  "'self'";
-
-    # script-src specifies valid sources for javascript, including inline handlers
-    set $scriptSrc  "'self' resource: https://${main_domain}";
-
-    # frame-ancestors specifies which origins can embed your CryptPad instance
-    # this must include 'self' and your main domain (over HTTPS) in order for CryptPad to work
-    # if you have enabled remote embedding via the admin panel then this must be more permissive.
-    # note: cryptpad.fr permits web pages served via https: and vector: (element desktop app)
-    set $frameAncestors "'self' {{ item.frameancestors | default('https://${main_domain}:') }}";
-    # set $frameAncestors "'self' https: vector:";
-
-    set $unsafe 0;
-    # the following assets are loaded via the sandbox domain
-    # they unfortunately still require exceptions to the sandboxing to work correctly.
-    if ($uri ~ ^\/(sheet|doc|presentation)\/inner.html.*$) { set $unsafe 1; }
-    if ($uri ~ ^\/common\/onlyoffice\/.*\/.*\.html.*$) { set $unsafe 1; }
-
-    # everything except the sandbox domain is a privileged scope, as they might be used to handle keys
-    if ($host != $sandbox_domain) { set $unsafe 0; }
-    # this iframe is an exception. Office file formats are converted outside of the sandboxed scope
-    # because of bugs in Chromium-based browsers that incorrectly ignore headers that are supposed to enable
-    # the use of some modern APIs that we require when javascript is run in a cross-origin context.
-    # We've applied other sandboxing techniques to mitigate the risk of running WebAssembly in this privileged scope
-    if ($uri ~ ^\/unsafeiframe\/inner\.html.*$) { set $unsafe 1; }
-
-    # privileged contexts allow a few more rights than unprivileged contexts, though limits are still applied
-    if ($unsafe) {
-        set $scriptSrc "'self' 'unsafe-eval' 'unsafe-inline' resource: https://${main_domain}";
-    }
-
-    # Finally, set all the rules you composed above.
-    add_header Content-Security-Policy "default-src 'none'; child-src $childSrc; worker-src $workerSrc; media-src $mediaSrc; style-src $styleSrc; script-src $scriptSrc; connect-src $connectSrc; font-src $fontSrc; img-src $imgSrc; frame-src $frameSrc; frame-ancestors $frameAncestors";
-
-    # Add support for .mjs files used by pdfjs
-    types {
-        application/javascript mjs;
-    }
 
+  # Finally, set all the rules you composed above.
+  add_header Content-Security-Policy "default-src 'none'; child-src $childSrc; worker-src $workerSrc; media-src $mediaSrc; style-src $styleSrc; script-src $scriptSrc; connect-src $connectSrc; font-src $fontSrc; img-src $imgSrc; frame-src $frameSrc;";
 {% endblock %}
 
 {% block root %}
@@ -138,90 +95,92 @@
     index index.html;
     error_page 404 /customize.dist/404.html;
 
+    # Finally, serve anything the above exceptions don't govern.
+    try_files /www/$uri /www/$uri/index.html /customize/$uri;
 {% endblock %}
 {% block location%}
-    # The nodejs process can handle all traffic whether accessed over websocket or as static assets
+  location ^~ /cryptpad_websocket {
-    # We prefer to serve static content from nginx directly and to leave the API server to handle
+    proxy_pass http://{{ item.proxy_pass }}:3000;
-    # the dynamic content that only it can manage. This is primarily an optimization
+    proxy_set_header X-Real-IP $remote_addr;
-    location ^~ /cryptpad_websocket {
+    proxy_set_header Host $host;
-        # XXX
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        # static assets like blobs and blocks are served by clustered workers in the API server
-        # Websocket traffic still needs to be handled by the main process, which means it needs
-        # to be hosted on a different port. By default 3003 will be used, though this is configurable
-        # via config.websocketPort
-        proxy_pass http://{{ item.proxy_pass }}:3003;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header Host $host;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 
-        # WebSocket support (nginx 1.4)
+    # WebSocket support (nginx 1.4)
-        proxy_http_version 1.1;
+    proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
+    proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection upgrade;
+    proxy_set_header Connection upgrade;
+  }
+
+  location ^~ /customize.dist/ {
+    # This is needed in order to prevent infinite recursion between /customize/ and the root
+  }
+
+  # try to load customizeable content via /customize/ and fall back to the default content
+  # located at /customize.dist/
+  # This is what allows you to override behaviour.
+  location ^~ /customize/ {
+    rewrite ^/customize/(.*)$ $1 break;
+    try_files /customize/$uri /customize.dist/$uri;
+  }
+
+  # /api/config is loaded once per page load and is used to retrieve
+  # the caching variable which is applied to every other resource
+  # which is loaded during that session.
+  location ~ ^/api/(config|broadcast).*$ {
+    proxy_pass http://{{ item.proxy_pass }}:3000;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header Host $host;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+
+    # These settings prevent both NGINX and the API server
+    # from setting the same headers and creating duplicates
+    proxy_hide_header Cross-Origin-Resource-Policy;
+    add_header Cross-Origin-Resource-Policy cross-origin;
+    proxy_hide_header Cross-Origin-Embedder-Policy;
+    add_header Cross-Origin-Embedder-Policy require-corp;
+  }
+
+  # encrypted blobs are immutable and are thus cached for a year
+  location ^~ /blob/ {
+    if ($request_method = 'OPTIONS') {
+        add_header 'Access-Control-Allow-Origin' '*';
+        add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
+        add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Content-Range,Range';
+        add_header 'Access-Control-Max-Age' 1728000;
+        add_header 'Content-Type' 'application/octet-stream; charset=utf-8';
+        add_header 'Content-Length' 0;
+        return 204;
     }
+    add_header Cache-Control max-age=31536000;
+    add_header 'Access-Control-Allow-Origin' '*';
+    add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
+    add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Content-Range,Range,Content-Length';
+    add_header 'Access-Control-Expose-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Content-Range,Range,Content-Length';
+    try_files $uri =404;
+  }
 
-    location ^~ /customize.dist/ {
+  # the "block-store" serves encrypted payloads containing users' drive keys
-        # This is needed in order to prevent infinite recursion between /customize/ and the root
+  # these payloads are unlocked via login credentials. They are mutable
-    }
+  # and are thus never cached. They're small enough that it doesn't matter, in any case.
-    # try to load customizeable content via /customize/ and fall back to the default content
+  location ^~ /block/ {
-    # located at /customize.dist/
+    add_header Cache-Control max-age=0;
-    # This is what allows you to override behaviour.
+    try_files $uri =404;
-    location ^~ /customize/ {
+  }
-        rewrite ^/customize/(.*)$ $1 break;
-        try_files /customize/$uri /customize.dist/$uri;
-    }
 
-    # /api/config is loaded once per page load and is used to retrieve
+{% if item.debug is defined and item.debug == 'true' %}
-    # the caching variable which is applied to every other resource
+  # This block provides an alternative means of loading content
-    # which is loaded during that session.
+  # otherwise only served via websocket. This is solely for debugging purposes,
-    location ~ ^/api/.*$ {
+  # and is thus not allowed by default.
-        proxy_pass http://{{ item.proxy_pass }}:3000;
+  location ^~ /datastore/ {
-        proxy_set_header X-Real-IP $remote_addr;
+    add_header Cache-Control max-age=0;
-        proxy_set_header Host $host;
+    try_files $uri =404;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+  }
+{% endif %}
 
-        # These settings prevent both NGINX and the API server
+  # The nodejs server has some built-in forwarding rules to prevent
-        # from setting the same headers and creating duplicates
+  # URLs like /pad from resulting in a 404. This simply adds a trailing slash
-        proxy_hide_header Cross-Origin-Resource-Policy;
+  # to a variety of applications.
-        add_header Cross-Origin-Resource-Policy cross-origin;
+  location ~ ^/(register|login|settings|user|pad|drive|poll|slide|code|whiteboard|file|media|profile|contacts|todo|filepicker|debug|kanban|sheet|support|admin|notifications|teams|calendar|presentation|doc|form|report|convert)$ {
-        proxy_hide_header Cross-Origin-Embedder-Policy;
+      rewrite ^(.*)$ $1/ redirect;
-        add_header Cross-Origin-Embedder-Policy require-corp;
+  }
-    }
-
-    # Requests for blobs and blocks are now proxied to the API server
-    # This simplifies NGINX path configuration in the event they are being hosted in a non-standard location
-    # or with odd unexpected permissions. Serving blobs in this manner also means that it will be possible to
-    # enforce access control for them, though this is not yet implemented.
-    # Access control (via TOTP 2FA) has been added to blocks, so they can be handled with the same directives.
-    location ~ ^/(blob|block)/.*$ {
-        if ($request_method = 'OPTIONS') {
-            add_header 'Access-Control-Allow-Origin' "${allowed_origins}";
-            add_header 'Access-Control-Allow-Credentials' true;
-            add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
-            add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Content-Range,Range';
-            add_header 'Access-Control-Max-Age' 1728000;
-            add_header 'Content-Type' 'application/octet-stream; charset=utf-8';
-            add_header 'Content-Length' 0;
-            return 204;
-        }
-        # Since we are proxying to the API server these headers can get duplicated
-        # so we hide them
-        proxy_hide_header 'X-Content-Type-Options';
-        proxy_hide_header 'Access-Control-Allow-Origin';
-        proxy_hide_header 'Permissions-Policy';
-        proxy_hide_header 'X-XSS-Protection';
-        proxy_hide_header 'Cross-Origin-Resource-Policy';
-        proxy_hide_header 'Cross-Origin-Embedder-Policy';
-        proxy_pass http://{{ item.proxy_pass }}:3000;
-    }
-
-    # The nodejs server has some built-in forwarding rules to prevent
-    # URLs like /pad from resulting in a 404. This simply adds a trailing slash
-    # to a variety of applications.
-    location ~ ^/(register|login|recovery|settings|user|pad|drive|poll|slide|code|whiteboard|file|media|profile|contacts|todo|filepicker|debug|kanban|sheet|support|admin|notifications|teams|calendar|presentation|doc|form|report|convert|checkup|diagram)$ {
-        rewrite ^(.*)$ $1/ redirect;
-    }
-
-    # Finally, serve anything the above exceptions don't govern.
-    try_files /customize/www/$uri /customize/www/$uri/index.html /www/$uri /www/$uri/index.html /customize/$uri;
 {% endblock %}

templates/etc/nginx/sites-available/cstate.j2

@@ -1,22 +0,0 @@
-{% extends "core.j2" %}
-
-{% block root %}
-  root {{ item.root }};
-  index {{ item.index }};
-{% endblock %}
-
-{% block location %}
-
-## LOCATIONS
-  location / {
-    # Add cache for static files
-    if ($request_uri ~* ^/(img|css|font|js)/) {
-      add_header Expires "Thu, 31 Dec 2037 23:55:55 GMT";
-      add_header Cache-Control "public, max-age=315360000";
-    }
-
-    # HTTPS only header, improves security
-    add_header Strict-Transport-Security "max-age=15768000";
-
-  }
-{% endblock %}

templates/etc/nginx/sites-available/etherpad.j2

@@ -1,28 +0,0 @@
-{% extends "core.j2" %}
-
-{% block location %}
-
-## LOCATIONS
-  location / {
-    proxy_pass {{ item.upstream_proto }}://{{ item.upstream_name }}:{{ item.upstream_port}};
-    proxy_set_header Host $host;
-    proxy_pass_header Server;
-    proxy_buffering off;
-    proxy_set_header X-Real-IP $remote_addr;
-    proxy_set_header X-Forwarded-For $remote_addr; 
-    proxy_set_header X-Forwarded-Proto $scheme; 
-    proxy_set_header Host $host;
-    proxy_http_version 1.1;
-    proxy_set_header Upgrade $http_upgrade;
-    proxy_set_header Connection "upgrade";
- 
-{% if item.secure_cookie is defined %}
-    proxy_cookie_path / "/; secure; HttpOnly; SameSite=strict";
-{% endif %}
-  }
-
-{% endblock %}
-{% block app_specific %}
-  rewrite /stats =404;
-
-{% endblock %}

templates/etc/nginx/sites-available/grav.j2

@@ -39,7 +39,7 @@
   location ~ \.php$ {
 {% if item.upstream_params is defined and item.upstream_params is iterable %}
 {% for param in item.upstream_params %}
-    {{ param }}
+		{{ param }}
 {% endfor %}
 {% endif %}
   }

templates/etc/nginx/sites-available/lemmy.j2

@@ -1,65 +0,0 @@
-limit_req_zone $binary_remote_addr zone={{ item.name }}_ratelimit:10m rate=1r/s;
-
-{% extends "core.j2" %}
-{% block extra_upstreams %}
-upstream lemmy {
-  server "{{ item.upstream_name }}:{{ item.lemmy_port }}";
-}
-upstream lemmy-ui {
-  server "{{ item.upstream_name }}:{{ item.lemmy_ui_port }}";
-}
-{% endblock %}
-{% block headers %}
-
-# Various content security headers
-  add_header Referrer-Policy "same-origin";
-  add_header X-Content-Type-Options "nosniff";
-  add_header X-Frame-Options "DENY";
-  add_header X-XSS-Protection "1; mode=block";
-
-{% endblock %}
-
-{% block location %}
-
-# frontend
-location / {
-  # The default ports:
-  # lemmy_ui_port: 1235
-  # lemmy_port: 8536
-
-  set $proxpass "{{ item.upstream_proto }}://lemmy-ui";
-
-  if ($http_accept ~ "application/activity+json") {
-    set $proxpass "{{ item.upstream_proto }}://lemmy";
-  }
-  if ($request_method = "application/ld+json; profile=\"https://www.w3.org/ns/activitystreams\"") {
-    set $proxpass "{{ item.upstream_proto }}://lemmy";
-  }
-  proxy_pass $proxpass;
-
-  rewrite ^(.+)/+$ $1 permanent;
-
-  # Send actual client IP upstream
-  proxy_set_header X-Real-IP $remote_addr;
-  proxy_set_header Host $host;
-  proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-  }
-
-# backend
-location ~ ^/(api|pictrs|feeds|nodeinfo|.well-known) {
-  proxy_pass {{ item.upstream_proto }}://lemmy;
-  proxy_http_version 1.1;
-  proxy_set_header Upgrade $http_upgrade;
-  proxy_set_header Connection "upgrade";
-
-  # Rate limit
-  #limit_req zone={{ item.name }}_ratelimit burst=30 nodelay;
-
-  # Add IP forwarding headers
-  proxy_set_header X-Real-IP $remote_addr;
-  proxy_set_header Host $host;
-  proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-  }
-{% endblock %}
-
-

templates/etc/nginx/sites-available/lufi.j2

@@ -10,16 +10,10 @@
       add_header Expires "Thu, 31 Dec 2037 23:55:55 GMT";
       add_header Cache-Control "public, max-age=315360000";
     }
-
+  
     # HTTPS only header, improves security
     add_header Strict-Transport-Security "max-age=15768000";
 
-    add_header Permissions-Policy "geolocation=(),interest-cohort=()";
-    add_header Referrer-Policy no-referrer;
-{% if item.secure_cookie is defined %}
-    proxy_cookie_path / "/; secure; HttpOnly; SameSite=strict";
-{% endif %}
-
     # Really important! Lufi uses WebSocket, it won't work without this
     proxy_set_header Upgrade $http_upgrade;
     proxy_set_header Connection "upgrade";

templates/etc/nginx/sites-available/maintenance.j2

@@ -1,6 +1,6 @@
 {% extends "core.j2" %}
 
-{% block root %}
+{%location root %}
   root {{ nginx_maintenance_page_root }};
   index index.html;
 {% endblock %}

templates/etc/nginx/sites-available/movim.j2

@@ -1,81 +0,0 @@
-
-{% if item.pic_cache is defined and item.pic_cache == 'true' %}
-fastcgi_cache_path /tmp/nginx_cache levels=1:2 keys_zone=nginx_cache:100m inactive=60m;
-fastcgi_cache_key "$scheme$request_method$host$request_uri";
-{% endif %}
-{% extends "core.j2" %}
-
-{% block root %}
-  root {{ nginx_www_dir }}{{ item.root }};
-  index index.php;
-{% endblock %}
-
-
-{% block location %}
-## LOCATIONS
-
-{% if item.proxy == 'true' %}
-  location / {
-    proxy_pass  {{ item.proto }}://{{ item.upstream_name }}:{{ item.listen }};
-    proxy_next_upstream error timeout invalid_header http_500 http_502 http_503;
-    proxy_set_header Host $host;
-    proxy_set_header X-Real-IP $remote_addr;
-    proxy_set_header X-Forwarded-For $remote_addr;
-    proxy_redirect off;
-  }
-
-{% else %}
-  location / {
-    set $no_cache 1;
-    try_files $uri $uri/ /index.php$is_args$args;
-  }
-{% endif %}
-
-  location ~ /\. {
-    deny all;
-  }
-
-  location = /favicon.ico {
-	  expires 30d;
-	  access_log off;
-	  log_not_found off;
-  }
-
-  location ~ ^/(config|temp|log)/ {
-    deny all;
-  }
-
-  location ~ \.php$ {
-    fastcgi_pass {{ item.fastcgi_pass }};
-    fastcgi_index index.php;
-    fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-    include fastcgi_params;
-    add_header X-Cache $upstream_cache_status;
-    fastcgi_ignore_headers "Cache-Control" "Expires" "Set-Cookie";
-    fastcgi_cache nginx_cache;
-    fastcgi_cache_valid any 7d;
-    fastcgi_cache_bypass $no_cache;
-    fastcgi_no_cache $no_cache;
-  }
-
-{% if item.ws is defined and item.ws == 'true' %}
-  location /ws/ {
-    proxy_pass {{ item.upstream_schema }}://{{ item.upstream_name }}:{{ item.upstream_port }};
-    proxy_http_version 1.1;
-    proxy_set_header Upgrade $http_upgrade;
-    proxy_set_header Connection "Upgrade";
-    proxy_set_header Host $host;
-    proxy_set_header X-Real-IP $remote_addr;
-    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    proxy_set_header X-Forwarded-Proto https;
-    proxy_redirect off;
-    }
-{% endif %}
-{% if item.pic_cache is defined and item.pic_cache == 'true' %}
-  location /picture {
-    set $no_cache 0; 
-    try_files $uri $uri/ /index.php$is_args$args;
-  }
-{% endif %}
-
-{% endblock %}

templates/etc/nginx/sites-available/mumble-web.j2

@@ -9,16 +9,13 @@ map $http_upgrade $connection_upgrade {
 {% endblock %}
 
 {% block location %}
-
   location / {
     root {{ item.root }};
   }
-
   location /server {
-    proxy_pass http://{{ item.server }}:{{ item.port }};
+    proxy_pass {{ item.proto }}://{{ item.server }}:{{ item.port }};
     proxy_http_version 1.1;
     proxy_set_header Upgrade $http_upgrade;
-    proxy_set_header Connection "upgrade";
+    proxy_set_header Connection $connection_upgrade;
   }
-
 {% endblock %}

templates/etc/nginx/sites-available/nextcloud.j2

@@ -2,127 +2,128 @@
 
 {% block extra_upstreams %}
 upstream php-handler {
-  server {{ item.php_handler }};
+  server {{ item.fastcgi_pass }};
-}
-
-# Set the `immutable` cache control options only for assets with a cache busting `v` argument
-map $arg_v $asset_immutable {
-  "" "";
-  default ", immutable";
 }
 {% endblock %}
 
 {% block root %}
   root {{ nginx_www_dir }}{{ item.root }};
+  index {{ item.index | default('index.html index.htm') }};
 
+  error_page 403 /core/templates/403.php;
+  error_page 404 /core/templates/404.php;
 {% endblock %}
 
 {% block headers %}
-  # HTTP response headers borrowed from Nextcloud `.htaccess`
+
-  add_header Referrer-Policy                   "no-referrer"       always;
+## HEADERS 
-  add_header X-Content-Type-Options            "nosniff"           always;
+  add_header Referrer-Policy "no-referrer" always;
-  add_header X-Frame-Options                   "SAMEORIGIN"        always;
+  add_header X-Content-Type-Options "nosniff" always;
-  add_header X-Permitted-Cross-Domain-Policies "none"              always;
+  add_header X-Download-Options "noopen" always;
-  add_header X-Robots-Tag                      "noindex, nofollow" always;
+  add_header X-Permitted-Cross-Domain-Policies "none" always;
-  add_header X-XSS-Protection                  "1; mode=block"     always;
+  add_header X-Robots-Tag "none" always;
+  add_header X-XSS-Protection "1; mode=block" always;
+
+  # Remove X-Powered-By, which is an information leak
+  fastcgi_hide_header X-Powered-By;
 {% endblock %}
 
 {% block location %}
-  # Rule borrowed from `.htaccess` to handle Microsoft DAV clients
+  # Path to the root of your installation
-  location = / {
-    if ( $http_user_agent ~ ^DavClnt ) {
-      return 302 /remote.php/webdav/$is_args$args;
-    }
-  }
-
   location = /robots.txt {
+  {% if item.robot_txt is defined %}  
     allow all;
     log_not_found off;
     access_log off;
+  {% else %}
+    deny all;
+    log_not_found off;
+    access_log off;
+  {% endif %}
+  }
+{% for app in nc_apps %}
+{% if app.name == 'user_webfinger' and app.state == 'enabled' %}
+  # The following 2 rules are only needed for the user_webfinger app.
+  rewrite ^/.well-known/host-meta /public.php?service=host-meta last;
+  rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last;
+{% endif %}
+{% if app.name == 'social' and app.state == 'enabled'%}
+  # The following rule is only needed for the Social app.
+  rewrite ^/.well-known/webfinger /public.php?service=webfinger last;
+{% endif %}
+{% endfor %}
+
+  location = /.well-known/carddav {
+    return 301 $scheme://$host:$server_port/remote.php/dav;
+  }
+  location = /.well-known/caldav {
+    return 301 $scheme://$host:$server_port/remote.php/dav;
   }
 
-  # Make a regex exception for `/.well-known` so that clients can still
+  location ~ ^\/(?:build|tests|config|lib|3rdparty|templates|data)\/ {
-  # access it despite the existence of the regex rule
+    deny all;
-  # `location ~ /(\.|autotest|...)` which would otherwise handle requests
+  }
-  # for `/.well-known`.
+  location ~ ^\/(?:\.|autotest|occ|issue|indie|db_|console) {
-  location ^~ /.well-known {
+    deny all;
-    # The rules in this block are an adaptation of the rules
-    # in `.htaccess` that concern `/.well-known`.
-    location = /.well-known/carddav { return 301 /remote.php/dav/; }
-    location = /.well-known/caldav  { return 301 /remote.php/dav/; }
-
-    location /.well-known/acme-challenge    { try_files $uri $uri/ =404; }
-    location /.well-known/pki-validation    { try_files $uri $uri/ =404; }
-
-    # Let Nextcloud's API for `/.well-known` URIs handle all other
-    # requests by passing them to the front-end controller.
-    return 301 /index.php$request_uri;
   }
 
-  # Rules borrowed from `.htaccess` to hide certain paths from clients
+  location ~ ^\/(?:index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|oc[ms]-provider\/.+)\.php(?:$|\/) {
-  location ~ ^/(?:build|tests|config|lib|3rdparty|templates|data)(?:$|/)  { return 404; }
+    fastcgi_split_path_info ^(.+?\.php)(\/.*|)$;
-  location ~ ^/(?:\.|autotest|occ|issue|indie|db_|console)                { return 404; }
-
-  # Ensure this block, which passes PHP files to the PHP process, is above the blocks
-  # which handle static assets (as seen below). If this block is not declared first,
-  # then Nginx will encounter an infinite rewriting loop when it prepends `/index.php`
-  # to the URI, resulting in a HTTP 500 error response.
-  location ~ \.php(?:$|/) {
-    # Required for legacy support
-    rewrite ^/(?!index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|ocs-provider\/.+|.+\/richdocumentscode(_arm64)?\/proxy) /index.php$request_uri;
-
-    fastcgi_split_path_info ^(.+?\.php)(/.*)$;
-    set $path_info $fastcgi_path_info;
-
     try_files $fastcgi_script_name =404;
-
     include fastcgi_params;
     fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-    fastcgi_param PATH_INFO $path_info;
+    fastcgi_param PATH_INFO $fastcgi_path_info;
     fastcgi_param HTTPS on;
-
+    # Avoid sending the security headers twice
-    fastcgi_param modHeadersAvailable true;         # Avoid sending the security headers twice
+    fastcgi_param modHeadersAvailable true;
-    fastcgi_param front_controller_active true;     # Enable pretty urls
+    # Enable pretty urls
+    fastcgi_param front_controller_active true;
     fastcgi_pass php-handler;
-
     fastcgi_intercept_errors on;
     fastcgi_request_buffering off;
-    fastcgi_max_temp_file_size 0;
   }
 
-  # Serve static files
+  location ~ ^\/(?:updater|oc[ms]-provider)(?:$|\/) {
-  location ~ \.(?:css|js|mjs|svg|gif|png|jpg|ico|wasm|tflite|map|ogg|flac)$ {
+    try_files $uri/ =404;
+    index index.php;
+  }
+
+  # Adding the cache control header for js, css and map files
+  # Make sure it is BELOW the PHP block
+  location ~ \.(?:css|js|woff2?|svg|gif|map)$ {
     try_files $uri /index.php$request_uri;
-    # HTTP response headers borrowed from Nextcloud `.htaccess`
+    add_header Cache-Control "public, max-age=15778463";
-    add_header Cache-Control                     "public, max-age=15778463$asset_immutable";
+    # Add headers to serve security related headers (It is intended to
-    add_header Referrer-Policy                   "no-referrer"       always;
+    # have those duplicated to the ones above)
-    add_header X-Content-Type-Options            "nosniff"           always;
+    # Before enabling Strict-Transport-Security headers please read into
-    add_header X-Frame-Options                   "SAMEORIGIN"        always;
+    # this topic first.
-    add_header X-Permitted-Cross-Domain-Policies "none"              always;
+    #add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload;" always;
-    add_header X-Robots-Tag                      "noindex, nofollow" always;
+    #
-    add_header X-XSS-Protection                  "1; mode=block"     always;
+    # WARNING: Only add the preload option once you read about
-    access_log off;     # Optional: Don't log access to assets
+    # the consequences in https://hstspreload.org/. This option
+    # will add the domain to a hardcoded list that is shipped
+    # in all major browsers and getting removed from this list
+    # could take several months.
+    add_header Referrer-Policy "no-referrer" always;
+    add_header X-Content-Type-Options "nosniff" always;
+    add_header X-Download-Options "noopen" always;
+    add_header X-Frame-Options "SAMEORIGIN" always;
+    add_header X-Permitted-Cross-Domain-Policies "none" always;
+    add_header X-Robots-Tag "none" always;
+    add_header X-XSS-Protection "1; mode=block" always;
+
+    # Optional: Don't log access to assets
+    access_log off;
   }
 
-  location ~ \.woff2?$ {
+  location ~ \.(?:png|html|ttf|ico|jpg|jpeg|bcmap)$ {
     try_files $uri /index.php$request_uri;
-    expires 7d;         # Cache-Control policy borrowed from `.htaccess`
+    # Optional: Don't log access to other assets
-    access_log off;     # Optional: Don't log access to assets
+    access_log off;
-  }
-
-  # Rule borrowed from `.htaccess`
-  location /remote {
-    return 301 /remote.php$request_uri;
-  }
-
-  location / {
-    try_files $uri $uri/ /index.php$request_uri;
   }
 {% endblock %}
 
 {% block app_specific %}
-  # set max upload size and increase upload timeout:
-  client_body_timeout 300s;
   fastcgi_buffers 64 4K;
 
   # Enable gzip but do not remove ETag headers
@@ -131,40 +132,6 @@ map $arg_v $asset_immutable {
   gzip_comp_level 4;
   gzip_min_length 256;
   gzip_proxied expired no-cache no-store private no_last_modified no_etag auth;
-  gzip_types application/atom+xml text/javascript application/javascript application/json application/ld+json application/manifest+json application/rss+xml application/vnd.geo+json application/vnd.ms-fontobject application/wasm application/x-font-ttf application/x-web-app-manifest+json application/xhtml+xml application/xml font/opentype image/bmp image/svg+xml image/x-icon text/cache-manifest text/css text/plain text/vcard text/vnd.rim.location.xloc text/vtt text/x-component text/x-cross-domain-policy;
+  gzip_types application/atom+xml application/javascript application/json application/ld+json application/manifest+json application/rss+xml application/vnd.geo+json application/vnd.ms-fontobject application/x-font-ttf application/x-web-app-manifest+json application/xhtml+xml application/xml font/opentype image/bmp image/svg+xml image/x-icon text/cache-manifest text/css text/plain text/vcard text/vnd.rim.location.xloc text/vtt text/x-component text/x-cross-domain-policy;
-
-  # Pagespeed is not supported by Nextcloud, so if your server is built
-  # with the `ngx_pagespeed` module, uncomment this line to disable it.
-  #pagespeed off;
-
-  # The settings allows you to optimize the HTTP2 bandwidth.
-  # See https://blog.cloudflare.com/delivering-http-2-upload-speed-improvements/
-  # for tuning hints
-  client_body_buffer_size 512k;
-
-  # Remove X-Powered-By, which is an information leak
-  fastcgi_hide_header X-Powered-By;
-
-  # Set .mjs and .wasm MIME types
-  # Either include it in the default mime.types list
-  # and include that list explicitly or add the file extension
-  # only for Nextcloud like below:
-  include mime.types;
-  types {
-    text/javascript js mjs;
-    application/wasm wasm;
-  }
-
-  # Specify how to handle directories -- specifying `/index.php$request_uri`
-  # here as the fallback means that Nginx always exhibits the desired behaviour
-  # when a client requests a path that corresponds to a directory that exists
-  # on the server. In particular, if that directory contains an index.php file,
-  # that file is correctly served; if it doesn't, then the request is passed to
-  # the front-end controller. This consistent behaviour means that we don't need
-  # to specify custom rules for certain paths (e.g. images and other assets,
-  # `/updater`, `/ocs-provider`), and thus
-  # `try_files $uri $uri/ /index.php$request_uri`
-  # always provides the desired behaviour.
-  index index.php index.html /index.php$request_uri;
 
 {% endblock %}

templates/etc/nginx/sites-available/pleroma.j2

@@ -1,54 +0,0 @@
-{% extends "core.j2" %}
-
-{% block extra_upstreams %}
-
-{% if item.mainsite is defined and item.mainsite == 'true' %}
-proxy_cache_path /tmp/pleroma-media-cache levels=1:2 keys_zone=pleroma_media_cache:10m max_size=10g inactive=720m use_temp_path=off;
-
-upstream phoenix {
-  server {{ item.upstream_name }}:4000 max_fails=5 fail_timeout=60s;
-}
-{% endif %}
-{% endblock %}
-
-{% block location %}
-
-{% if item.mainsite is defined and item.mainsite == 'true' %}
-  location / {
-    proxy_pass http://phoenix;
-{% if item.mangane is defined and item.mangane == 'true' %}
-    proxy_hide_header Content-Security-Policy;
-    add_header Content-Security-Policy "upgrade-insecure-requests;script-src 'self';connect-src 'self' blob:     https://{{ item.name }} wss://{{ item.name }};media-src 'self' https:;img-src 'self' data: blob: https:;default-   src 'none';base-uri 'self';frame-ancestors 'none';style-src 'self' 'unsafe-inline';font-src 'self';manifest-src  'self';" always;
-{% endif %}
-  }
-{% endif %}
-
-{% if item.mediasite == 'true' %}
-  location ~ ^/(media|proxy) {
-    proxy_cache        pleroma_media_cache;
-    slice              1m;
-    proxy_cache_key    $host$uri$is_args$args$slice_range;
-    proxy_set_header   Range $slice_range;
-    proxy_cache_valid  200 206 301 304 1h;
-    proxy_cache_lock   on;
-    proxy_ignore_client_abort on;
-    proxy_buffering    on;
-    chunked_transfer_encoding on;
-    proxy_pass         http://phoenix;
-  }
-{% endif %}
-{% if item.mediasite is defined and item.mediasite == 'false' %}
-  location ~ ^/(media) {
-    rewrite ^/(.*)$ https://{{ item.mediasiteurl }}$1 permanent;
-  }
-{% endif %}
-{% endblock %}
-{% block app_specific %}
-
-  proxy_http_version 1.1;
-  proxy_set_header Upgrade $http_upgrade;
-  proxy_set_header Connection "upgrade";
-  proxy_set_header Host $http_host;
-  proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-
-{% endblock %}

templates/etc/nginx/sites-available/privatebin.j2

@@ -2,7 +2,7 @@
 {% block root %}
   root {{ nginx_www_dir }}{{ item.root }};
   index {{ item.index }};
-  try_files {{ item.override_try_files | default('try_files $uri $uri/ /index.php$is_args$args') }};
+  try_files {{ item.override_try_files | default('$uri $uri/ /index.php') }};
 {% endblock %}
 
 {% block location %}
@@ -28,7 +28,22 @@
  
 {% endblock %}
 
+{% block extra_upstreams %}
+map $http_user_agent $pastebin_badagent {
+  ~*bot 1;
+  ~*spider 1;
+  ~*crawl 1;
+  ~https?:// 1;
+  WhatsApp 1;
+  SkypeUriPreview 1;
+  facebookexternalhit 1;
+}
+{% endblock %}
+
 {% block app_specific %}
+  if ($pastebin_badagent) {
+    return 403;
+  }
 
   location /cfg {
     return 403;
@@ -37,12 +52,4 @@
   location /data {
     deny all;
   }
-{% if item.file_cache is defined and item.file_cache is iterable %}
-{% for param in item.file_cache %}
-  open_file_cache          {{ param.cache }};
-  open_file_cache_valid    {{ param.valid }};
-  open_file_cache_min_uses {{ param.min_users }};
-  open_file_cache_errors   {{ param.cache_errors }};
-{% endfor %}
-{% endif %}
 {% endblock %}

templates/etc/nginx/sites-available/proxy.j2

@@ -9,55 +9,53 @@
     proxy_next_upstream error timeout invalid_header http_500 http_502 http_503;
     proxy_set_header Host $host;
     proxy_set_header X-Real-IP $remote_addr;
-    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header X-Forwarded-For $remote_addr;
-    proxy_set_header X-Forwarded-Proto $scheme;
     proxy_redirect off;
 {% if item.secure_cookie is defined %}
     proxy_cookie_path / "/; secure; HttpOnly; SameSite=strict";
 {% endif %}
-{% if item.location_extra_options is defined %}
-{% for option in item.location_extra_options %}
-    {{ option }}
-{% endfor %}
-{% endif %}
 {% if item.root_custom_headers is defined %}
-    #headers
+{% for header in item.root_custom_headers %}
-{% if header.permission_policy is defined and header.permission_policy == 'none' %}
+{% if header.secure_site is defined %}
-{% else %}
-    add_header Permissions-Policy "geolocation=(),interest-cohort=()";
-{% endif %}
-{% if header.secure_site is defined and header.secure_site == 'none' %}
-{% else %}
     add_header X-Download-Options noopen;
     add_header X-Permitted-Cross-Domain-Policies none;
+    add_header Referrer-Policy {{ item.referrer | default('no-referrer') }};
+{% if header.header_sameorigin is defined %}
+    add_header X-Frame-Options "SAMEORIGIN";
 {% endif %}
-{% if header.referrer is defined and header.referrer == 'none' %}
-{% else %}
-    add_header Referrer-Policy "{{ header.referrer | default('no-referrer') }}";
 {% endif %}
-{% if header.xframe is defined and header.xframe == 'none' %}
+{% if header.nginx_HSTS_policy is defined %}
-{% else %}
+    add_header Strict-Transport-Security "max-age=63072000; includeSubDomains; preload";
-    add_header X-Frame-Options "{{ header.xframe | default("SAMEORIGIN") }}";
 {% endif %}
-{% if header.nginx_HSTS_policy is defined and header.nginx_HSTS_policy == 'none' %}
+{% if header.referrer is defined %}
-{% else %}
+    add_header Referrer-Policy no-referrer;
-    add_header Strict-Transport-Security "max-age={{ nginx_hsts_age }}; includeSubDomains; preload;" always;
 {% endif %}
 {% if header.csp is defined %}
-    add_header Content-Security-Policy "{{ header.csp | default("default-src 'self'; script-src 'self'; connect-src 'self'; img-src 'self'; style-src 'self'; base-uri 'self'; form-action 'self';") }}";
+    add_header Content-Security-Policy "{{ header.csp }}";
 {% endif %}
-{% if header.cto is defined and header.cto == 'none' %}
+{% if header.cto is defined %}
+{% if header.cto == 'none' %}
 {% else %}
-    add_header X-Content-Type-Options "{{ header.cto | default('nosniff') }}";
+    add_header X-Content-Type-Options {{ header.cto }};
 {% endif %}
-{%if header.xss is defined and header.xss == 'none' %}
 {% else %}
-    add_header X-XSS-Protection "{{ header.xss | default('1; mode=block') }}";
+    add_header X-Content-Type-Options nosniff;
 {% endif %}
-{% if header.robots is defined and header.robots == 'none' %}
+{%if header.xss is defined %}
+{% if header.xss == 'none' %}
 {% else %}
-    add_header X-Robots-Tag "{{ header.robots | default('none') }}";
+    add_header X-XSS-Protection "{{ header.xss }}";
 {% endif %}
+{% else %}
+    add_header X-XSS-Protection "1; mode=block";
+{% endif %}
+{% if header.robots is defined %}
+    add_header X-Robots-Tag "{{ header.robots }}";
+{% else %}
+    add_header X-Robots-Tag none;
+{% endif %}
+
+{% endfor %}
 {% endif %}
 
   }
@@ -132,4 +130,4 @@
 {% endfor %}
 {% endif %}
 {% endblock %}
-```
+```

templates/etc/nginx/sites-available/searx.j2

@@ -2,31 +2,19 @@
 
 {%block root %}
   root {{ searx_app_dir }}/searx;
-{% if item.real_ip_from is defined %}
-set_real_ip_from {{ item.real_ip_from }};
-{% endif %}
 {% endblock %}
 
 {% block location %}
   location / {
-{% if item.upstream_name is defined %}
+{% if item.filtron == 'true' %}
-    proxy_pass {{ item.upstream_proto }}://{{ item.upstream_name }}:{{ item.upstream_port }};
+    proxy_set_header        Host    $http_host;
-    proxy_set_header   Host    $http_host;
+    proxy_set_header        X-Real-IP $remote_addr;
-    proxy_set_header   Connection       $http_connection;
+    proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
-    proxy_set_header   X-Real-IP $remote_addr;
+    proxy_set_header        X-Scheme $scheme;
-    proxy_set_header   X-Scheme $scheme;
+    proxy_pass http://127.0.0.1:4004/;
-    proxy_set_header   X-Forwarded-For  $proxy_add_x_forwarded_for;
-    proxy_set_header   X-Script-Name    {{ searx_app_dir }};
 {% else %}
     include uwsgi_params;
-    uwsgi_pass unix://{{ searx_socket }};
+    uwsgi_pass unix:/run/uwsgi/app/searx/socket;
-    uwsgi_param    HTTP_HOST             $host;
-    #uwsgi_param    HTTP_CONNECTION       $http_connection;
-    uwsgi_param    HTTP_CONNECTION       '';
-    uwsgi_param    HTTP_X_SCHEME         $scheme;
-    #uwsgi_param    HTTP_X_SCRIPT_NAME    {{ searx_app_dir }};
-    uwsgi_param    HTTP_X_REAL_IP        $remote_addr;
-    uwsgi_param    HTTP_X_FORWARDED_FOR  $proxy_add_x_forwarded_for;
 {% endif %}
   }
-{% endblock %} 
+{% endblock %}

templates/etc/nginx/sites-available/zabbix_check.j2

@@ -1,23 +1,10 @@
 server {
-  listen {{ item.port }};
+  listen 10061;
   
-  location /basic_status {
+  location /nginx_status {
-    stub_status;
+    stub_status on;
     access_log off;
     allow 127.0.0.1;
     deny all;
   }
-{% if item.php_check is defined and item.php_check == 'true' %}
-   location ~ ^/(status|ping)$ {
-     access_log off;
-     allow 127.0.0.1;
-     deny all;
- 
-     fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-     fastcgi_index index.php;
-     include fastcgi_params;
-     fastcgi_pass unix:{{ pool_listen }};
-  }
-{% endif %}
-
 }

templates/etc/tor/torrc.j2

@@ -1,195 +0,0 @@
-## Configuration file for a typical Tor user
-## Last updated 9 October 2013 for Tor 0.2.5.2-alpha.
-## (may or may not work for much older or much newer versions of Tor.)
-##
-## Lines that begin with "## " try to explain what's going on. Lines
-## that begin with just "#" are disabled commands: you can enable them
-## by removing the "#" symbol.
-##
-## See 'man tor', or https://www.torproject.org/docs/tor-manual.html,
-## for more options you can use in this file.
-##
-## Tor will look for this file in various places based on your platform:
-## https://www.torproject.org/docs/faq#torrc
-
-## Tor opens a socks proxy on port 9050 by default -- even if you don't
-## configure one below. Set "SocksPort 0" if you plan to run Tor only
-## as a relay, and not make any local application connections yourself.
-#SocksPort 9050 # Default: Bind to localhost:9050 for local connections.
-#SocksPort 192.168.0.1:9100 # Bind to this address:port too.
-
-## Entry policies to allow/deny SOCKS requests based on IP address.
-## First entry that matches wins. If no SocksPolicy is set, we accept
-## all (and only) requests that reach a SocksPort. Untrusted users who
-## can access your SocksPort may be able to learn about the connections
-## you make.
-#SocksPolicy accept 192.168.0.0/16
-#SocksPolicy reject *
-
-## Logs go to stdout at level "notice" unless redirected by something
-## else, like one of the below lines. You can have as many Log lines as
-## you want.
-##
-## We advise using "notice" in most cases, since anything more verbose
-## may provide sensitive information to an attacker who obtains the logs.
-##
-## Send all messages of level 'notice' or higher to /var/log/tor/notices.log
-#Log notice file /var/log/tor/notices.log
-## Send every possible message to /var/log/tor/debug.log
-#Log debug file /var/log/tor/debug.log
-## Use the system log instead of Tor's logfiles
-#Log notice syslog
-## To send all messages to stderr:
-#Log debug stderr
-
-## Uncomment this to start the process in the background... or use
-## --runasdaemon 1 on the command line. This is ignored on Windows;
-## see the FAQ entry if you want Tor to run as an NT service.
-#RunAsDaemon 1
-
-## The directory for keeping all the keys/etc. By default, we store
-## things in $HOME/.tor on Unix, and in Application Data\tor on Windows.
-#DataDirectory /var/lib/tor
-
-## The port on which Tor will listen for local connections from Tor
-## controller applications, as documented in control-spec.txt.
-#ControlPort 9051
-## If you enable the controlport, be sure to enable one of these
-## authentication methods, to prevent attackers from accessing it.
-#HashedControlPassword 16:872860B76453A77D60CA2BB8C1A7042072093276A3D701AD684053EC4C
-#CookieAuthentication 1
-
-############### This section is just for location-hidden services ###
-
-## Once you have configured a hidden service, you can look at the
-## contents of the file ".../hidden_service/hostname" for the address
-## to tell people.
-##
-## HiddenServicePort x y:z says to redirect requests on port x to the
-## address y:z.
-
-{% for item in nginx_vhosts  %}
-{% if item.onion is defined and item.onion == 'true' %}
-HiddenServiceDir /var/lib/tor/{{ item.name }}/
-HiddenServicePort {{ item.torlisten }} unix:/var/run/{{ item.name }}.sock
-{% endif %}
-{% endfor %}
-
-#HiddenServiceDir /var/lib/tor/other_hidden_service/
-#HiddenServicePort 80 127.0.0.1:80
-#HiddenServicePort 22 127.0.0.1:22
-
-################ This section is just for relays #####################
-#
-## See https://www.torproject.org/docs/tor-doc-relay for details.
-
-## Required: what port to advertise for incoming Tor connections.
-#ORPort 9001
-## If you want to listen on a port other than the one advertised in
-## ORPort (e.g. to advertise 443 but bind to 9090), you can do it as
-## follows.  You'll need to do ipchains or other port forwarding
-## yourself to make this work.
-#ORPort 443 NoListen
-#ORPort 127.0.0.1:9090 NoAdvertise
-
-## The IP address or full DNS name for incoming connections to your
-## relay. Leave commented out and Tor will guess.
-#Address noname.example.com
-
-## If you have multiple network interfaces, you can specify one for
-## outgoing traffic to use.
-# OutboundBindAddress 10.0.0.5
-
-## A handle for your relay, so people don't have to refer to it by key.
-#Nickname ididnteditheconfig
-
-## Define these to limit how much relayed traffic you will allow. Your
-## own traffic is still unthrottled. Note that RelayBandwidthRate must
-## be at least 20 KB.
-## Note that units for these config options are bytes per second, not bits
-## per second, and that prefixes are binary prefixes, i.e. 2^10, 2^20, etc.
-#RelayBandwidthRate 100 KB  # Throttle traffic to 100KB/s (800Kbps)
-#RelayBandwidthBurst 200 KB # But allow bursts up to 200KB/s (1600Kbps)
-
-## Use these to restrict the maximum traffic per day, week, or month.
-## Note that this threshold applies separately to sent and received bytes,
-## not to their sum: setting "4 GB" may allow up to 8 GB total before
-## hibernating.
-##
-## Set a maximum of 4 gigabytes each way per period.
-#AccountingMax 4 GB
-## Each period starts daily at midnight (AccountingMax is per day)
-#AccountingStart day 00:00
-## Each period starts on the 3rd of the month at 15:00 (AccountingMax
-## is per month)
-#AccountingStart month 3 15:00
-
-## Administrative contact information for this relay or bridge. This line
-## can be used to contact you if your relay or bridge is misconfigured or
-## something else goes wrong. Note that we archive and publish all
-## descriptors containing these lines and that Google indexes them, so
-## spammers might also collect them. You may want to obscure the fact that
-## it's an email address and/or generate a new address for this purpose.
-#ContactInfo Random Person <nobody AT example dot com>
-## You might also include your PGP or GPG fingerprint if you have one:
-#ContactInfo 0xFFFFFFFF Random Person <nobody AT example dot com>
-
-## Uncomment this to mirror directory information for others. Please do
-## if you have enough bandwidth.
-#DirPort 9030 # what port to advertise for directory connections
-## If you want to listen on a port other than the one advertised in
-## DirPort (e.g. to advertise 80 but bind to 9091), you can do it as
-## follows.  below too. You'll need to do ipchains or other port
-## forwarding yourself to make this work.
-#DirPort 80 NoListen
-#DirPort 127.0.0.1:9091 NoAdvertise
-## Uncomment to return an arbitrary blob of html on your DirPort. Now you
-## can explain what Tor is if anybody wonders why your IP address is
-## contacting them. See contrib/tor-exit-notice.html in Tor's source
-## distribution for a sample.
-#DirPortFrontPage /etc/tor/tor-exit-notice.html
-
-## Uncomment this if you run more than one Tor relay, and add the identity
-## key fingerprint of each Tor relay you control, even if they're on
-## different networks. You declare it here so Tor clients can avoid
-## using more than one of your relays in a single circuit. See
-## https://www.torproject.org/docs/faq#MultipleRelays
-## However, you should never include a bridge's fingerprint here, as it would
-## break its concealability and potentionally reveal its IP/TCP address.
-#MyFamily $keyid,$keyid,...
-
-## A comma-separated list of exit policies. They're considered first
-## to last, and the first match wins. If you want to _replace_
-## the default exit policy, end this with either a reject *:* or an
-## accept *:*. Otherwise, you're _augmenting_ (prepending to) the
-## default exit policy. Leave commented to just use the default, which is
-## described in the man page or at
-## https://www.torproject.org/documentation.html
-##
-## Look at https://www.torproject.org/faq-abuse.html#TypicalAbuses
-## for issues you might encounter if you use the default exit policy.
-##
-## If certain IPs and ports are blocked externally, e.g. by your firewall,
-## you should update your exit policy to reflect this -- otherwise Tor
-## users will be told that those destinations are down.
-##
-## For security, by default Tor rejects connections to private (local)
-## networks, including to your public IP address. See the man page entry
-## for ExitPolicyRejectPrivate if you want to allow "exit enclaving".
-##
-#ExitPolicy accept *:6660-6667,reject *:* # allow irc ports but no more
-#ExitPolicy accept *:119 # accept nntp as well as default exit policy
-#ExitPolicy reject *:* # no exits allowed
-
-## Bridge relays (or "bridges") are Tor relays that aren't listed in the
-## main directory. Since there is no complete public list of them, even an
-## ISP that filters connections to all the known Tor relays probably
-## won't be able to block all the bridges. Also, websites won't treat you
-## differently because they won't know you're running Tor. If you can
-## be a real relay, please do; but if not, be a bridge!
-#BridgeRelay 1
-## By default, Tor will advertise your bridge to users through various
-## mechanisms like https://bridges.torproject.org/. If you want to run
-## a private bridge, for example because you'll give out your bridge
-## address manually to your friends, uncomment this line:
-#PublishServerDescriptor 0