diff --git a/files/docker/config.json b/files/docker/config.json index 8ffe9df..8dd09b8 100644 --- a/files/docker/config.json +++ b/files/docker/config.json @@ -1,5 +1,5 @@ { - "data-root": "/home/sonny/vm/docker", + "data-root": "/var/lib/vm/docker", "log-driver": "json-file", "log-opts": { "max-size": "100m", diff --git a/tasks/nginx.yml b/tasks/nginx.yml index 3d0dd9d..f62cc77 100644 --- a/tasks/nginx.yml +++ b/tasks/nginx.yml @@ -10,7 +10,7 @@ - { src: 'templates/nginx/default.j2', dest: '/etc/nginx/sites-available/default' } - { src: 'templates/nginx/forgejo.j2', dest: '/etc/nginx/sites-available/forgejo' } - { src: 'templates/nginx/woodpecker.j2', dest: '/etc/nginx/sites-available/woodpecker' } - - { src: 'templates/nginx/sentry.j2', dest: '/etc/nginx/sites-available/sentry' } + - { src: 'templates/nginx/glitchtip.j2', dest: '/etc/nginx/sites-available/glitchtip' } - { src: 'templates/nginx/vpn.j2', dest: '/etc/nginx/sites-available/vpn' } - { src: 'templates/nginx/newsreader.j2', @@ -38,8 +38,8 @@ dest: '/etc/nginx/sites-enabled/woodpecker', } - { - src: '/etc/nginx/sites-available/sentry', - dest: '/etc/nginx/sites-enabled/sentry', + src: '/etc/nginx/sites-available/glitchtip', + dest: '/etc/nginx/sites-enabled/glitchtip', } - { src: '/etc/nginx/sites-available/vpn', dest: '/etc/nginx/sites-enabled/vpn' } - { diff --git a/templates/nginx/sentry.j2 b/templates/nginx/glitchtip.j2 similarity index 50% rename from templates/nginx/sentry.j2 rename to templates/nginx/glitchtip.j2 index 232036c..388ddb8 100644 --- a/templates/nginx/sentry.j2 +++ b/templates/nginx/glitchtip.j2 @@ -2,28 +2,22 @@ server { listen {{ https_port }} ssl; - server_name {{ sentry_domain }}; + server_name {{ glitchtip_domain }}; include snippets/certificates.conf; include snippets/ssl-params.conf; - access_log /var/log/nginx/sentry.log; - error_log /var/log/nginx/sentry.log; + access_log /var/log/nginx/glitchtip.log; + error_log /var/log/nginx/glitchtip.log; + + client_max_body_size 40M; location / { - gzip off; - - proxy_read_timeout 90; - proxy_connect_timeout 90; - proxy_redirect off; - - 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-Ssl on; proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header X-Frame-Options SAMEORIGIN; - proxy_pass http://{{ sentry_ip }}:{{ sentry_port }}; + proxy_pass http://{{ glitchtip_ip }}:{{ glitchtip_port }}; } } diff --git a/vars/network.yml b/vars/network.yml index 942665b..c709e92 100644 --- a/vars/network.yml +++ b/vars/network.yml @@ -22,8 +22,8 @@ woodpecker_port: '7000' newsreader_ip: '127.0.0.1' newsreader_port: '5000' -sentry_ip: '127.0.0.1' -sentry_port: '9000' +glitchtip_ip: '127.0.0.1' +glitchtip_port: '7200' syncthing_gui_port: 8384 syncthing_protocol_port: 22000 diff --git a/vars/nginx.yml b/vars/nginx.yml index 2acc5b3..273534f 100644 --- a/vars/nginx.yml +++ b/vars/nginx.yml @@ -1,5 +1,5 @@ domain_name: 'fudiggity.nl' forgejo_domain: 'forgejo.fudiggity.nl' woodpecker_domain: 'woodpecker.fudiggity.nl' -sentry_domain: 'sentry.fudiggity.nl' +glitchtip_domain: 'glitchtip.fudiggity.nl' newsreader_domain: 'rss.fudiggity.nl'