bastian/deploy_home
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added https parts site, video site, fixed modsecurity

Browse Source
This commit is contained in:
Bastian de Byl
2022-04-12 01:15:51 -04:00
parent 232b28a647
commit 9fbe473e3c
22 changed files with 193 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ansible/roles/http/defaults/main.yml
View File

@@ -10,6 +10,7 @@ pi_server_name: pi.bdebyl.net
assistant_server_name: assistant.bdebyl.net
home_server_name: home.bdebyl.net
parts_server_name: parts.bdebyl.net
video_server_name: video.bdebyl.net
install_path: /usr/share
nginx_path: /etc/nginx

19
ansible/roles/http/tasks/http.yml
View File

@@ -19,6 +19,18 @@
- sites-available
tags: http
- name: ensure http/s directories exist
become: true
file:
path: "{{ item }}"
state: directory
owner: http
group: http
loop:
- /srv/http
- /srv/http/letsencrypt
tags: http
- name: chown http user home
become: true
file:
@@ -39,6 +51,7 @@
- "{{ pi_server_name }}.conf"
- "{{ home_server_name }}.conf"
- "{{ assistant_server_name }}.conf"
- "{{ video_server_name }}.conf"
- "{{ parts_server_name }}.conf"
notify: restart_nginx
tags: http
@@ -62,5 +75,11 @@
- "{{ parts_server_name }}.conf"
- "{{ home_server_name }}.conf"
- "{{ assistant_server_name }}.conf"
- "{{ video_server_name }}.conf"
notify: restart_nginx
tags: http
- name: validate nginx configurations
become: true
shell: nginx -t
tags: http

2
ansible/roles/http/tasks/https.yml
View File

@@ -7,6 +7,7 @@
mode: 0644
loop:
- "{{ ci_server_name }}.https.conf"
- "{{ parts_server_name }}.https.conf"
notify: restart_nginx
tags: https
@@ -18,5 +19,6 @@
state: link
loop:
- "{{ ci_server_name }}.https.conf"
- "{{ parts_server_name }}.https.conf"
notify: restart_nginx
tags: https

13
ansible/roles/http/tasks/modsec.yml
View File

@@ -35,36 +35,37 @@
- name: setup modsec and coreruleset configs
become: true
file:
copy:
src: "{{ item.src }}"
dest: "{{ item.dest }}"
state: link
force: true
mode: 0644
remote_src: true
loop: "{{ modsec_conf_links }}"
notify: restart_nginx
tags: modsec
- name: setup coreruleset rules
become: true
file:
copy:
src: "{{ crs_rules_path }}/{{ item.name }}.conf"
dest: "{{ modsec_rules_path }}/{{ item.name }}.conf"
state: "{{ item.enabled | ternary('link', 'absent') }}"
force: true
mode: 0644
remote_src: true
when: item.enabled
loop: "{{ crs_rule_links }}"
notify: restart_nginx
tags: modsec, modsec_rules
- name: setup coreruleset data
become: true
file:
copy:
src: "{{ crs_rules_path }}/{{ item }}.data"
dest: "{{ modsec_rules_path }}/{{ item }}.data"
state: link
force: true
mode: 0644
remote_src: true
loop: "{{ crs_data_links }}"
notify: restart_nginx
tags: modsec, modsec_rules

4
ansible/roles/http/tasks/security.yml
View File

@@ -9,4 +9,6 @@
- access
- error
notify: restart_fail2ban
tags: http, security
tags:
- http
- security

3
ansible/roles/http/templates/nginx/sites/assistant.bdebyl.net.conf.j2
View File

@@ -2,6 +2,9 @@ upstream hass {
server 127.0.0.1:8123;
}
server {
modsecurity on;
modsecurity_rules_file {{ nginx_path }}/modsec_includes.conf;
listen 80;
server_name {{ assistant_server_name }};

2
ansible/roles/http/templates/nginx/sites/ci.bdebyl.net.http.conf.j2
View File

@@ -4,7 +4,7 @@ server {
server_name {{ ci_server_name }};
location /.well-known {
root /srv/http;
root /srv/http/letsencrypt;
try_files $uri $uri/ =404;
}

6
ansible/roles/http/templates/nginx/sites/ci.bdebyl.net.https.conf.j2
View File

@@ -3,6 +3,9 @@ upstream drone {
}
server {
modsecurity on;
modsecurity_rules_file {{ nginx_path }}/modsec_includes.conf;
listen 443 ssl http2;
listen [::]:443 ssl http2;
server_name {{ ci_server_name }};
@@ -22,9 +25,6 @@ server {
ssl_stapling_verify on;
location / {
modsecurity on;
modsecurity_rules_file {{ nginx_path }}/modsec_includes.conf;
add_header Allow "GET, POST, HEAD" always;
add_header Content-Security-Policy "default-src 'self'; img-src 'self' https://*.githubusercontent.com; frame-ancestors 'self'; base-uri 'none',base-uri 'self'; form-action 'self'" always;
add_header Referrer-Policy "same-origin" always;

3
ansible/roles/http/templates/nginx/sites/home.bdebyl.net.conf.j2
View File

@@ -4,6 +4,9 @@ geo $whitelisted {
}
server {
modsecurity on;
modsecurity_rules_file {{ nginx_path }}/modsec_includes.conf;
listen 80 default_server;
server_name {{ home_server_name }};
if ($whitelisted = 1) {

18
ansible/roles/http/templates/nginx/sites/parts.bdebyl.net.conf.j2
View File

@@ -3,20 +3,20 @@ geo $whitelisted {
192.168.1.0/24 1;
}
upstream partkeepr {
server localhost:8081;
}
server {
modsecurity on;
modsecurity_rules_file {{ nginx_path }}/modsec_includes.conf;
listen 80;
listen [::]:80;
server_name {{ parts_server_name }};
if ($whitelisted = 0) {
return 302 $scheme://bdebyl.net$request_uri;
}
location /.well-known {
root /srv/http/letsencrypt;
try_files $uri $uri/ =404;
}
location / {
proxy_pass http://partkeepr;
proxy_connect_timeout 1s;
return 302 https://$host$request_uri;
}
}

56
ansible/roles/http/templates/nginx/sites/parts.bdebyl.net.https.conf.j2 Normal file
View File

@@ -0,0 +1,56 @@
geo $whitelisted {
default 0;
192.168.1.0/24 1;
}
upstream partkeepr {
server localhost:8081;
}
server {
modsecurity on;
modsecurity_rules_file {{ nginx_path }}/modsec_includes.conf;
listen 443 ssl http2;
listen [::]:443 ssl http2;
server_name {{ parts_server_name }};
ssl_certificate /etc/letsencrypt/live/{{ parts_server_name }}/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/{{ parts_server_name }}/privkey.pem;
ssl_trusted_certificate /etc/letsencrypt/live/{{ parts_server_name }}/fullchain.pem;
ssl_dhparam /etc/ssl/certs/dhparam.pem;
ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384;
ssl_prefer_server_ciphers off;
ssl_protocols TLSv1.2 TLSv1.3;
ssl_session_cache shared:SSL:10m;
ssl_session_tickets off;
ssl_session_timeout 1d;
ssl_stapling on;
ssl_stapling_verify on;
if ($whitelisted = 0) {
return 302 $scheme://bdebyl.net$request_uri;
}
location / {
add_header Referrer-Policy "same-origin" always;
# add_header Strict-Transport-Security "max-age=630720000; includeSubDomains" always;
add_header X-Content-Type-Options "nosniff" always;
# Sent from upstream:
# add_header X-Frame-Options "SAMEORIGIN";
# add_header X-XSS-Protection "1; mode=block";
proxy_set_header Host $http_host;
proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_buffering off;
proxy_http_version 1.1;
proxy_pass http://partkeepr;
proxy_redirect off;
chunked_transfer_encoding off;
}
}

3
ansible/roles/http/templates/nginx/sites/pi.bdebyl.net.conf.j2
View File

@@ -5,6 +5,9 @@
#
server {
modsecurity on;
modsecurity_rules_file {{ nginx_path }}/modsec_includes.conf;
listen 80;
listen [::]:80;

24
ansible/roles/http/templates/nginx/sites/video.bdebyl.net.conf.j2 Normal file
View File

@@ -0,0 +1,24 @@
upstream shinobi {
server 127.0.0.1:8085;
}
server {
modsecurity on;
modsecurity_rules_file {{ nginx_path }}/modsec_includes.conf;
listen 80;
server_name {{ video_server_name }};
location / {
allow 192.168.1.0/24;
allow 127.0.0.1;
deny all;
proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection $connection_upgrade;
proxy_buffering off;
proxy_pass http://shinobi;
}
}