diff --git a/compose/nginx/compose.yaml b/compose/nginx/compose.yaml index e59f568..1da025b 100644 --- a/compose/nginx/compose.yaml +++ b/compose/nginx/compose.yaml @@ -16,7 +16,9 @@ services: - /home/hane/pihanepi/config/nginx/nginx.conf:/etc/nginx/nginx.conf:ro,Z - /home/hane/pihanepi/config/nginx/fastcgi_params:/etc/nginx/fastcgi_params:ro,Z - /home/hane/pihanepi/config/nginx/fastcgi.conf:/etc/nginx/fastcgi.conf:ro,Z - + # We also create and map a certs folder for TLS + - /home/hane/pihanepi/config/nginx/certs:/etc/nginx/certs/ + # Logs folder - /home/hane/pihanepi/datamount/nginx/log:/var/log/nginx:Z # Web root folder diff --git a/compose/vault/compose.yaml b/compose/vault/compose.yaml new file mode 100644 index 0000000..33be154 --- /dev/null +++ b/compose/vault/compose.yaml @@ -0,0 +1,38 @@ + +services: + nginx: + name: vaultmirror + #image: hane-dokuwiki-image:dokuwiki-fixed-volume + image: vaultwarden/server:latest-alpine + build: ./ + volumes: + # Data store + - /home/hane/pihanepi/datamount/vault/data:/data + + # Logs folder + #- /home/hane/pihanepi/datamount/nginx/log:/var/log/nginx:Z + #- ./apache2.conf:/etc/apache2/apache2.conf + #- type: bind + # source: ./001-wiki.conf + # target: /etc/apache2/sites-enabled/001-wiki.conf + #- ./init.sh:/init.sh + #- ${WIKI_DATA:-/path/to/data}:/var/www/dokuwiki + ports: + - "8000:80/tcp" + #- "8080:80/udp" + #- "44345:443/tcp" + #- "44344:443/udp" + #entrypoint: /init.sh + #entrypoint: bash + stdin_open: true # docker run -i + tty: true # docker run -t + +#volumes: +# dokuwiki: +# external: true +# labels: +# - "dev.roboces.wiki=Dokuwiki volume" +# name: dokuwiki + + + diff --git a/config/nginx/certs/.gitignore b/config/nginx/certs/.gitignore new file mode 100644 index 0000000..b7756a6 --- /dev/null +++ b/config/nginx/certs/.gitignore @@ -0,0 +1,2 @@ +*.pem +*.key \ No newline at end of file diff --git a/config/nginx/nginx.conf b/config/nginx/nginx.conf index 7f6d62e..c82de2c 100644 --- a/config/nginx/nginx.conf +++ b/config/nginx/nginx.conf @@ -1,4 +1,3 @@ - #user nobody; worker_processes 1; @@ -8,7 +7,6 @@ worker_processes 1; #pid logs/nginx.pid; - events { worker_connections 1024; } @@ -32,13 +30,29 @@ http { #gzip on; + upstream vaultwarden-default { + zone vaultwarden-default 64k; + server 192.168.1.45:8000; + keepalive 2; + } + + # Needed to support websocket connections + # See: https://nginx.org/en/docs/http/websocket.html + # Instead of "close" as stated in the above link we send an empty value. + # Else all keepalive connections will not work. + map $http_upgrade $connection_upgrade { + default upgrade; + '' ""; + } + server { listen 80; server_name localhost; #access_log logs/host.access.log main; - location / { + location / { + rewrite ^/test(.*)$ / break; root /var/www; index index.html index.htm; } @@ -93,23 +107,31 @@ http { # HTTPS server # - #server { - # listen 443 ssl; - # server_name localhost; + server { + listen 443 ssl; + server_name localhost 192.168.1.45 internal.test; - # ssl_certificate cert.pem; - # ssl_certificate_key cert.key; + ssl_certificate /etc/nginx/certs/CERTS.pem; + ssl_certificate_key /etc/nginx/certs/KEY.pem; + #cert.key - # ssl_session_cache shared:SSL:1m; - # ssl_session_timeout 5m; + ssl_session_cache shared:SSL:1m; + ssl_session_timeout 5m; - # ssl_ciphers HIGH:!aNULL:!MD5; - # ssl_prefer_server_ciphers on; + ssl_ciphers HIGH:!aNULL:!MD5; + ssl_prefer_server_ciphers on; + rewrite ^/test(.*)$ / break; - # location / { - # root html; - # index index.html index.htm; - # } - #} + + #location /test { + # rewrite ^/test(.*)$ / break; + # root /var/www; + # index index.html index.htm; + #} + + location / { + proxy_pass http://vaultwarden-default; + } + } } diff --git a/config/vault/compose.yaml b/config/vault/compose.yaml new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/config/vault/compose.yaml @@ -0,0 +1 @@ + diff --git a/datamount/nginx/log/.gitignore b/datamount/nginx/log/.gitignore new file mode 100644 index 0000000..d6b7ef3 --- /dev/null +++ b/datamount/nginx/log/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/datamount/vault/.gitignore b/datamount/vault/.gitignore new file mode 100644 index 0000000..d6b7ef3 --- /dev/null +++ b/datamount/vault/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/rules-save b/rules-save new file mode 100644 index 0000000..5f979c6 --- /dev/null +++ b/rules-save @@ -0,0 +1,12 @@ +# Generated by iptables-save v1.8.11 (nf_tables) on Wed May 20 21:29:27 2026 +*nat +:PREROUTING ACCEPT [0:0] +:INPUT ACCEPT [0:0] +:OUTPUT ACCEPT [1:128] +:POSTROUTING ACCEPT [0:0] +[0:0] -A PREROUTING -p tcp -m tcp --dport 80 -j REDIRECT --to-ports 8080 +[0:0] -A PREROUTING -p tcp -m tcp --dport 443 -j REDIRECT --to-ports 44344 +[0:0] -A OUTPUT -o lo -p tcp -m tcp --dport 80 -j REDIRECT --to-ports 8080 +[0:0] -A OUTPUT -o lo -p tcp -m tcp --dport 443 -j REDIRECT --to-ports 44344 +COMMIT +# Completed on Wed May 20 21:29:27 2026