aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ansible/roles/git-mirrors/tasks/main.yml6
-rw-r--r--ansible/roles/git-mirrors/templates/nginx-site.conf.j22
-rw-r--r--ansible/roles/git-mirrors/vars/main.yml3
3 files changed, 6 insertions, 5 deletions
diff --git a/ansible/roles/git-mirrors/tasks/main.yml b/ansible/roles/git-mirrors/tasks/main.yml
index a65377a..bcc559c 100644
--- a/ansible/roles/git-mirrors/tasks/main.yml
+++ b/ansible/roles/git-mirrors/tasks/main.yml
@@ -114,7 +114,7 @@
- name: Template NGINX configuration
template:
src: nginx-site.conf.j2
- dest: /etc/nginx/sites-available/cgit.conf
+ dest: "/etc/nginx/sites-available/{{ git_mirrors_nginx_config_name }}"
mode: "0444"
owner: root
group: root
@@ -125,8 +125,8 @@
- name: Enable the NGINX site
file:
- src: /etc/nginx/sites-available/cgit.conf
- dest: /etc/nginx/sites-enabled/cgit.conf
+ src: "/etc/nginx/sites-available/{{ git_mirrors_nginx_config_name }}"
+ dest: "/etc/nginx/sites-enabled/{{ git_mirrors_nginx_config_name }}"
state: link
tags:
- role::git-mirrors
diff --git a/ansible/roles/git-mirrors/templates/nginx-site.conf.j2 b/ansible/roles/git-mirrors/templates/nginx-site.conf.j2
index c20b8fc..5b819f2 100644
--- a/ansible/roles/git-mirrors/templates/nginx-site.conf.j2
+++ b/ansible/roles/git-mirrors/templates/nginx-site.conf.j2
@@ -1,5 +1,5 @@
server {
- server_name {{ git_mirrors_nginx_url }};
+ server_name {{ git_mirrors_nginx_domain }};
listen 443 ssl http2;
listen [::]:443 ssl http2;
diff --git a/ansible/roles/git-mirrors/vars/main.yml b/ansible/roles/git-mirrors/vars/main.yml
index e0477ce..6c2197a 100644
--- a/ansible/roles/git-mirrors/vars/main.yml
+++ b/ansible/roles/git-mirrors/vars/main.yml
@@ -65,6 +65,7 @@ git_mirrors_mirrored_repositories:
description: >-
Owl Corp surveillance storage platform
-git_mirrors_nginx_url: "git.pydis.wtf"
+git_mirrors_nginx_domain: "git.pydis.wtf"
git_mirrors_nginx_cert_file: "/etc/letsencrypt/live/pydis.wtf/fullchain.pem"
git_mirrors_nginx_cert_key: "/etc/letsencrypt/live/pydis.wtf/privkey.pem"
+git_mirrors_nginx_config_name: "git.pydis.wtf.conf"