Compare commits

...

3 commits

Author SHA1 Message Date
d2bfe3e018 Replace gitlab with forgejo setup 2024-12-09 19:29:42 +01:00
41fa6b52ef Don't upgrade docker packages 2024-12-09 19:29:10 +01:00
07f500e884 Pin radicale version 2024-12-09 19:26:55 +01:00
8 changed files with 15 additions and 12 deletions

View file

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

View file

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

View file

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

View file

@ -20,7 +20,7 @@ table ip filter {
ip protocol icmp accept ip protocol icmp accept
iifname "{{ network_interface }}" tcp dport {{ ssh_port }} accept comment "SSH" 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 { {{ http_port }}, {{ https_port }} } accept comment "HTTP/HTTPS"
iifname "{{ network_interface }}" tcp dport {{ transmission_port }} accept comment "Transmission" iifname "{{ network_interface }}" tcp dport {{ transmission_port }} accept comment "Transmission"

View file

@ -2,13 +2,13 @@
server { server {
listen {{ https_port }} ssl; listen {{ https_port }} ssl;
server_name {{ gitlab_domain }}; server_name {{ forgejo_domain }};
include snippets/certificates.conf; include snippets/certificates.conf;
include snippets/ssl-params.conf; include snippets/ssl-params.conf;
access_log /var/log/nginx/gitlab.log; access_log /var/log/nginx/forgejo.log;
error_log /var/log/nginx/gitlab.log; error_log /var/log/nginx/forgejo.log;
location / { location / {
gzip off; gzip off;
@ -24,6 +24,6 @@ server {
proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-Frame-Options SAMEORIGIN; proxy_set_header X-Frame-Options SAMEORIGIN;
proxy_pass http://{{ gitlab_ip }}:{{ gitlab_port }}; proxy_pass http://{{ forgejo_ip }}:{{ forgejo_port }};
} }
} }

View file

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

View file

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

View file

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