Compare commits
3 commits
4c68081a8d
...
d2bfe3e018
| Author | SHA1 | Date | |
|---|---|---|---|
| d2bfe3e018 | |||
| 41fa6b52ef | |||
| 07f500e884 |
8 changed files with 15 additions and 12 deletions
|
|
@ -31,6 +31,7 @@
|
|||
become: true
|
||||
apt:
|
||||
update_cache: true
|
||||
state: present
|
||||
name:
|
||||
- docker-ce
|
||||
- docker-ce-cli
|
||||
|
|
|
|||
|
|
@ -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',
|
||||
|
|
|
|||
|
|
@ -31,6 +31,7 @@
|
|||
pip:
|
||||
name: radicale
|
||||
state: present
|
||||
version: '{{ radicale_version }}'
|
||||
virtualenv: '/usr/local/lib/radicale/env'
|
||||
notify: restart radicale service
|
||||
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
||||
|
|
|
|||
|
|
@ -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 }};
|
||||
}
|
||||
}
|
||||
|
|
@ -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'
|
||||
|
|
|
|||
|
|
@ -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'
|
||||
|
|
|
|||
|
|
@ -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_certificate_authority_path: '/etc/ssl/localcerts/radicale/client_cert.pem'
|
||||
radicale_storage_path: '/etc/radicale/collections'
|
||||
radicale_version: 3.3.1
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue