Merge branch 'master' into lemmy
This commit is contained in:
commit
49d682554b
|
|
@ -15,6 +15,7 @@ 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'
|
||||
|
|
@ -74,3 +75,11 @@ 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
|
||||
|
|
|
|||
|
|
@ -9,3 +9,8 @@
|
|||
systemd:
|
||||
name: nginx
|
||||
state: reloaded
|
||||
|
||||
- name: restart tor
|
||||
systemd:
|
||||
name: tor
|
||||
state: restarted
|
||||
|
|
|
|||
|
|
@ -1,13 +1,24 @@
|
|||
---
|
||||
|
||||
- name: "[NGINX] - Install packages"
|
||||
include: install.yml
|
||||
include_tasks: install.yml
|
||||
|
||||
- name: "[NGINX] - Configure nginx"
|
||||
include: config.yml
|
||||
include_tasks: config.yml
|
||||
|
||||
- name: "[NGINX] - Set SSL configuration"
|
||||
include: ssl.yml
|
||||
|
||||
- name: '[NGINX] - Deploy TOR for onion hidden services'
|
||||
include: 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: vhost.yml
|
||||
include_tasks: vhost.yml
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,43 @@
|
|||
---
|
||||
|
||||
- name: '[ONION] - register onion address'
|
||||
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"
|
||||
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"
|
||||
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"
|
||||
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"
|
||||
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'
|
||||
|
||||
|
|
@ -0,0 +1,42 @@
|
|||
---
|
||||
|
||||
|
||||
- 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
|
||||
|
||||
|
|
@ -1,5 +1,9 @@
|
|||
---
|
||||
|
||||
- name: "[NGINX] - Create vhosts"
|
||||
set_fact:
|
||||
enable_tor: 'false'
|
||||
|
||||
- name: "[NGINX] - Create vhosts"
|
||||
template:
|
||||
src: etc/nginx/sites-available/{{ item.template }}.j2
|
||||
|
|
@ -44,3 +48,12 @@
|
|||
notify:
|
||||
- reload nginx
|
||||
when: nginx_default_vhost is not none
|
||||
|
||||
- name: "[NGINX] - Create maintenance vhosts"
|
||||
template:
|
||||
src: etc/nginx/sites-available/maintenance.j2
|
||||
dest: "{{ nginx_etc_dir }}/sites-available/maintenance-{{ item.name }}"
|
||||
with_items: "{{ nginx_vhosts }}"
|
||||
notify:
|
||||
- reload nginx
|
||||
when: (item.state is defined) and (item.state != 'delete') and (item.maintenance is defined) and (item.maintenance == 'true')
|
||||
|
|
|
|||
|
|
@ -18,7 +18,9 @@ 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 }};
|
||||
|
|
|
|||
|
|
@ -8,6 +8,11 @@
|
|||
|
||||
{% 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' %}
|
||||
|
|
@ -27,6 +32,7 @@ server {
|
|||
{{ htpasswd(item.htpasswd, 1) }}
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
{% block root %}
|
||||
{% endblock %}
|
||||
|
|
@ -49,50 +55,41 @@ server {
|
|||
{% if item.headers is defined and item.headers == 'none' %}
|
||||
{% else %}
|
||||
## HEADERS
|
||||
{% if item.permission_policy is defined and item.permission_policy == 'none' %}
|
||||
{% if item.header_permission_policy is defined and item.header_permission_policy == 'none' %}
|
||||
{% else %}
|
||||
add_header Permissions-Policy "geolocation=(),interest-cohort=()";
|
||||
{% endif %}
|
||||
{% if item.secure_site is defined %}
|
||||
{% if item.secure_site is defined and item.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') }};
|
||||
{% endif %}
|
||||
{% if item.header_sameorigin is defined %}
|
||||
add_header X-Frame-Options "SAMEORIGIN";
|
||||
{% 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' %}
|
||||
{% if item.header_referrer is defined and item.header_referrer == 'none' %}
|
||||
{% else %}
|
||||
add_header X-Content-Type-Options {{ item.cto }};
|
||||
add_header Referrer-Policy "{{ item.header_referrer | default('no-referrer') }}";
|
||||
{% endif %}
|
||||
{% if item.header_xframe is defined and item.header_xframe == 'none' %}
|
||||
{% else %}
|
||||
add_header X-Content-Type-Options nosniff;
|
||||
add_header X-Frame-Options "{{ item.header_xframe | default("SAMEORIGIN") }}";
|
||||
{% endif %}
|
||||
{%if item.xss is defined %}
|
||||
{% if item.xss == 'none' %}
|
||||
{% if item.nginx_HSTS_policy is defined and item.nginx_HSTS_policy == 'none' %}
|
||||
{% else %}
|
||||
add_header X-XSS-Protection "{{ item.xss }}";
|
||||
add_header Strict-Transport-Security "max-age={{ nginx_hsts_age }}; includeSubDomains; preload;" always;
|
||||
{% endif %}
|
||||
{% else %}
|
||||
add_header X-XSS-Protection "1; mode=block";
|
||||
{% 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.robots is defined %}
|
||||
{% if item.robots == 'none' %}
|
||||
{% if item.header_cto is defined and item.header_cto == 'none' %}
|
||||
{% else %}
|
||||
add_header X-Robots-Tag "{{ item.robots }}";
|
||||
add_header X-Content-Type-Options "{{ item.header_cto | default('nosniff') }}";
|
||||
{% endif %}
|
||||
{%if item.header_xss is defined and item.header_xss == 'none' %}
|
||||
{% else %}
|
||||
add_header X-Robots-Tag none;
|
||||
add_header X-XSS-Protection "{{ item.header_xss | default('1; mode=block') }}";
|
||||
{% endif %}
|
||||
{% if item.header_robots is defined and item.header_robots == 'none' %}
|
||||
{% else %}
|
||||
add_header X-Robots-Tag "{{ item.header_robots | default('none') }}";
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
|
|
@ -110,21 +107,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=63072000; includeSubDomains; preload";
|
||||
{% endif %}
|
||||
{% if item.referrer is defined %}
|
||||
add_header Referrer-Policy no-referrer;
|
||||
add_header Strict-Transport-Security "max-age={{ nginx_hsts_age }}; includeSubDomains; preload;" always;
|
||||
{% endif %}
|
||||
{% if item.csp is defined %}
|
||||
add_header Content-Security-Policy "{{ item.csp }}";
|
||||
|
|
@ -185,7 +182,8 @@ 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
|
||||
|
||||
|
|
|
|||
|
|
@ -45,9 +45,12 @@
|
|||
add_header Cross-Origin-Resource-Policy cross-origin;
|
||||
add_header Cross-Origin-Embedder-Policy require-corp;
|
||||
|
||||
# any static assets loaded with "ver=" in their URL will be cached for a year
|
||||
# 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;
|
||||
set $cacheControl no-cache;
|
||||
}
|
||||
if ($args ~ ver=) {
|
||||
set $cacheControl max-age=31536000;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,28 @@
|
|||
{% 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 %}
|
||||
|
|
@ -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 %}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,10 +5,21 @@
|
|||
## LOCATIONS
|
||||
location / {
|
||||
proxy_pass {{ item.upstream_proto }}://{{ item.upstream_name }}:{{ item.upstream_port}};
|
||||
|
||||
# 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";
|
||||
|
||||
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";
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{% extends "core.j2" %}
|
||||
|
||||
{%location root %}
|
||||
{% block root %}
|
||||
root {{ nginx_maintenance_page_root }};
|
||||
index index.html;
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -9,13 +9,16 @@ map $http_upgrade $connection_upgrade {
|
|||
{% endblock %}
|
||||
|
||||
{% block location %}
|
||||
|
||||
location / {
|
||||
root {{ item.root }};
|
||||
}
|
||||
|
||||
location /server {
|
||||
proxy_pass {{ item.proto }}://{{ item.server }}:{{ item.port }};
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Upgrade $http_upgrade;
|
||||
proxy_set_header Connection $connection_upgrade;
|
||||
proxy_set_header Connection "upgrade";
|
||||
}
|
||||
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -17,12 +17,15 @@ upstream php-handler {
|
|||
{% block headers %}
|
||||
|
||||
## HEADERS
|
||||
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-Permitted-Cross-Domain-Policies "none" always;
|
||||
add_header X-Robots-Tag "none" always;
|
||||
add_header X-XSS-Protection "1; mode=block" always;
|
||||
add_header Permissions-Policy "geolocation=(),interest-cohort=()";
|
||||
add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload;" always;
|
||||
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;
|
||||
|
||||
# Remove X-Powered-By, which is an information leak
|
||||
fastcgi_hide_header X-Powered-By;
|
||||
|
|
|
|||
|
|
@ -2,11 +2,10 @@
|
|||
|
||||
{% block extra_upstreams %}
|
||||
|
||||
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;
|
||||
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 127.0.0.1:4000 max_fails=5 fail_timeout=60s;
|
||||
server {{ item.upstream_name }}:4000 max_fails=5 fail_timeout=60s;
|
||||
}
|
||||
{% endblock %}
|
||||
|
||||
|
|
@ -28,4 +27,14 @@ upstream phoenix {
|
|||
chunked_transfer_encoding on;
|
||||
proxy_pass http://phoenix;
|
||||
}
|
||||
{% endblock %}
|
||||
|
||||
{% 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 %}
|
||||
|
|
|
|||
|
|
@ -15,47 +15,43 @@
|
|||
proxy_cookie_path / "/; secure; HttpOnly; SameSite=strict";
|
||||
{% endif %}
|
||||
{% if item.root_custom_headers is defined %}
|
||||
{% for header in item.root_custom_headers %}
|
||||
{% if header.secure_site is defined %}
|
||||
#headers
|
||||
{% if header.permission_policy is defined and header.permission_policy == 'none' %}
|
||||
{% 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.nginx_HSTS_policy is defined %}
|
||||
add_header Strict-Transport-Security "max-age=63072000; includeSubDomains; preload";
|
||||
{% if header.xframe is defined and header.xframe == 'none' %}
|
||||
{% else %}
|
||||
add_header X-Frame-Options "{{ header.xframe | default("SAMEORIGIN") }}";
|
||||
{% endif %}
|
||||
{% if header.referrer is defined %}
|
||||
add_header Referrer-Policy no-referrer;
|
||||
{% if header.nginx_HSTS_policy is defined and header.nginx_HSTS_policy == 'none' %}
|
||||
{% else %}
|
||||
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 }}";
|
||||
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';") }}";
|
||||
{% endif %}
|
||||
{% if header.cto is defined %}
|
||||
{% if header.cto == 'none' %}
|
||||
{% if header.cto is defined and header.cto == 'none' %}
|
||||
{% else %}
|
||||
add_header X-Content-Type-Options {{ header.cto }};
|
||||
add_header X-Content-Type-Options "{{ header.cto | default('nosniff') }}";
|
||||
{% endif %}
|
||||
{%if header.xss is defined and header.xss == 'none' %}
|
||||
{% else %}
|
||||
add_header X-Content-Type-Options nosniff;
|
||||
add_header X-XSS-Protection "{{ header.xss | default('1; mode=block') }}";
|
||||
{% endif %}
|
||||
{%if header.xss is defined %}
|
||||
{% if header.xss == 'none' %}
|
||||
{% if header.robots is defined and header.robots == 'none' %}
|
||||
{% else %}
|
||||
add_header X-XSS-Protection "{{ header.xss }}";
|
||||
add_header X-Robots-Tag "{{ header.robots | default('none') }}";
|
||||
{% 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 %}
|
||||
|
||||
}
|
||||
|
|
@ -130,4 +126,4 @@
|
|||
{% endfor %}
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
```
|
||||
```
|
||||
|
|
|
|||
|
|
@ -18,9 +18,10 @@
|
|||
include uwsgi_params;
|
||||
uwsgi_pass unix://{{ searx_socket }};
|
||||
uwsgi_param HTTP_HOST $host;
|
||||
uwsgi_param HTTP_CONNECTION $http_connection;
|
||||
#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_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 %}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,195 @@
|
|||
## 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.listen }} 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
|
||||
Loading…
Reference in New Issue