tasks/docker.yml

@@ -31,7 +31,6 @@
   become: true
   apt:
     update_cache: true
-    state: present
     name:
       - docker-ce
       - docker-ce-cli

tasks/nginx.yml

@@ -8,7 +8,7 @@
     mode: '0644'
   loop:
     - { 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/gitlab.j2', dest: '/etc/nginx/sites-available/gitlab' }
     - { 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/forgejo',
+        src: '/etc/nginx/sites-available/gitlab',
-        dest: '/etc/nginx/sites-enabled/forgejo',
+        dest: '/etc/nginx/sites-enabled/gitlab',
       }
     - {
         src: '/etc/nginx/sites-available/sentry',

tasks/radicale.yml

@@ -31,7 +31,6 @@
   pip:
     name: radicale
     state: present
-    version: '{{ radicale_version }}'
     virtualenv: '/usr/local/lib/radicale/env'
   notify: restart radicale service
 

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 {{ forgejo_ssh_port }} accept comment "Forgejo SSH"
+    iifname "{{ network_interface }}" tcp dport {{ gitlab_ssh_port }} accept comment "Gitlab SSH"
     iifname "{{ network_interface }}" tcp dport { {{ http_port }}, {{ https_port }} } accept comment "HTTP/HTTPS"
     iifname "{{ network_interface }}" tcp dport {{ transmission_port }} accept comment "Transmission"
 

templates/nginx/gitlab.j2

@@ -2,13 +2,13 @@
 
 server {
 	listen {{ https_port }} ssl;
-	server_name {{ forgejo_domain }};
+	server_name {{ gitlab_domain }};
 
 	include snippets/certificates.conf;
 	include snippets/ssl-params.conf;
 
-	access_log /var/log/nginx/forgejo.log;
+	access_log /var/log/nginx/gitlab.log;
-	error_log /var/log/nginx/forgejo.log;
+	error_log /var/log/nginx/gitlab.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://{{ forgejo_ip }}:{{ forgejo_port }};
+		proxy_pass 				http://{{ gitlab_ip }}:{{ gitlab_port }};
 	}
 }

vars/network.yml

@@ -12,9 +12,9 @@ mpd_port: 21000
 mpd_http_stream_port: 8000
 mpd_http_mobile_stream_port: 8001
 
-forgejo_ip: '127.0.0.1'
+gitlab_ip: '127.0.0.1'
-forgejo_port: '3000'
+gitlab_port: '9090'
-forgejo_ssh_port: '22'
+gitlab_ssh_port: '22'
 
 newsreader_ip: '127.0.0.1'
 newsreader_port: '5000'

vars/nginx.yml

@@ -1,4 +1,4 @@
 domain_name: 'fudiggity.nl'
-forgejo_domain: 'forgejo.fudiggity.nl'
+gitlab_domain: 'git.fudiggity.nl'
 sentry_domain: 'sentry.fudiggity.nl'
 newsreader_domain: 'rss.fudiggity.nl'

vars/radicale.yml

@@ -2,4 +2,3 @@ radicale_certificate_path: '/etc/ssl/localcerts/radicale/server_cert.pem'
 radicale_key_path: '/etc/ssl/localcerts/radicale/server_key.pem'
 radicale_certificate_authority_path: '/etc/ssl/localcerts/radicale/client_cert.pem'
 radicale_storage_path: '/etc/radicale/collections'
-radicale_version: 3.3.1