diff --git a/tasks/nginx.yml b/tasks/nginx.yml index 15141f9..51bb317 100644 --- a/tasks/nginx.yml +++ b/tasks/nginx.yml @@ -8,7 +8,7 @@ mode: '0644' loop: - { src: 'templates/nginx/default.j2', dest: '/etc/nginx/sites-available/default' } - - { src: 'templates/nginx/gitlab.j2', dest: '/etc/nginx/sites-available/gitlab' } + - { src: 'templates/nginx/forgejo.j2', dest: '/etc/nginx/sites-available/forgejo' } - { src: 'templates/nginx/sentry.j2', dest: '/etc/nginx/sites-available/sentry' } - { src: 'templates/nginx/vpn.j2', dest: '/etc/nginx/sites-available/vpn' } - { @@ -29,8 +29,8 @@ dest: '/etc/nginx/sites-enabled/default', } - { - src: '/etc/nginx/sites-available/gitlab', - dest: '/etc/nginx/sites-enabled/gitlab', + src: '/etc/nginx/sites-available/forgejo', + dest: '/etc/nginx/sites-enabled/forgejo', } - { src: '/etc/nginx/sites-available/sentry', diff --git a/templates/nftables.j2 b/templates/nftables.j2 index c521d68..934064a 100644 --- a/templates/nftables.j2 +++ b/templates/nftables.j2 @@ -20,7 +20,7 @@ table ip filter { ip protocol icmp accept iifname "{{ network_interface }}" tcp dport {{ ssh_port }} accept comment "SSH" - iifname "{{ network_interface }}" tcp dport {{ gitlab_ssh_port }} accept comment "Gitlab SSH" + iifname "{{ network_interface }}" tcp dport {{ forgejo_ssh_port }} accept comment "Forgejo SSH" iifname "{{ network_interface }}" tcp dport { {{ http_port }}, {{ https_port }} } accept comment "HTTP/HTTPS" iifname "{{ network_interface }}" tcp dport {{ transmission_port }} accept comment "Transmission" diff --git a/templates/nginx/gitlab.j2 b/templates/nginx/forgejo.j2 similarity index 75% rename from templates/nginx/gitlab.j2 rename to templates/nginx/forgejo.j2 index 1bcf67d..d4ea676 100644 --- a/templates/nginx/gitlab.j2 +++ b/templates/nginx/forgejo.j2 @@ -2,13 +2,13 @@ server { listen {{ https_port }} ssl; - server_name {{ gitlab_domain }}; + server_name {{ forgejo_domain }}; include snippets/certificates.conf; include snippets/ssl-params.conf; - access_log /var/log/nginx/gitlab.log; - error_log /var/log/nginx/gitlab.log; + access_log /var/log/nginx/forgejo.log; + error_log /var/log/nginx/forgejo.log; location / { gzip off; @@ -24,6 +24,6 @@ server { proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Frame-Options SAMEORIGIN; - proxy_pass http://{{ gitlab_ip }}:{{ gitlab_port }}; + proxy_pass http://{{ forgejo_ip }}:{{ forgejo_port }}; } } diff --git a/vars/network.yml b/vars/network.yml index bd9f4bf..f8bb487 100644 --- a/vars/network.yml +++ b/vars/network.yml @@ -12,9 +12,9 @@ mpd_port: 21000 mpd_http_stream_port: 8000 mpd_http_mobile_stream_port: 8001 -gitlab_ip: '127.0.0.1' -gitlab_port: '9090' -gitlab_ssh_port: '22' +forgejo_ip: '127.0.0.1' +forgejo_port: '3000' +forgejo_ssh_port: '22' newsreader_ip: '127.0.0.1' newsreader_port: '5000' diff --git a/vars/nginx.yml b/vars/nginx.yml index b90b75c..3639d00 100644 --- a/vars/nginx.yml +++ b/vars/nginx.yml @@ -1,4 +1,4 @@ domain_name: 'fudiggity.nl' -gitlab_domain: 'git.fudiggity.nl' +forgejo_domain: 'forgejo.fudiggity.nl' sentry_domain: 'sentry.fudiggity.nl' newsreader_domain: 'rss.fudiggity.nl'