From f863d87fbf982df632f16ae5c14fc01b0a334e8c Mon Sep 17 00:00:00 2001
From: Timotej Lazar <timotej.lazar@fri.uni-lj.si>
Date: Tue, 28 May 2024 13:34:34 +0200
Subject: [PATCH] dokuwiki: remove hardcoded names

---
 roles/dokuwiki/tasks/main.yml             | 10 +++++-----
 roles/dokuwiki/templates/dokuwiki.conf.j2 | 11 +++++++----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/roles/dokuwiki/tasks/main.yml b/roles/dokuwiki/tasks/main.yml
index 643dcf6..39b97e7 100644
--- a/roles/dokuwiki/tasks/main.yml
+++ b/roles/dokuwiki/tasks/main.yml
@@ -5,17 +5,17 @@
   package:
     name: php-openssl,php-session,php-xml
 
-- name: Get current dokuwiki version if any
+- name: Check if dokuwiki should be upgraded
   lineinfile:
-    path: /srv/http/doku.fri.uni-lj.si/VERSION
+    path: /srv/http/dokuwiki/VERSION
     search_string: '{{ dokuwiki_version }}'
     state: absent
   check_mode: true
   changed_when: false
-  register: current_version
+  register: is_current
 
 - name: Install or upgrade dokuwiki
-  when: 'current_version.found|default(0) == 0'
+  when: 'is_current.found|default(0) == 0'
   block:
   - name: Download dokuwiki tarball
     get_url:
@@ -29,7 +29,7 @@
 
   - name: Copy dokuwiki files
     copy:
-      dest: /srv/http/doku.fri.uni-lj.si/
+      dest: /srv/http/dokuwiki/
       src: '/var/tmp/dokuwiki-{{ dokuwiki_version }}/'
       remote_src: true
       owner: nginx
diff --git a/roles/dokuwiki/templates/dokuwiki.conf.j2 b/roles/dokuwiki/templates/dokuwiki.conf.j2
index 686e6f9..fd483f3 100644
--- a/roles/dokuwiki/templates/dokuwiki.conf.j2
+++ b/roles/dokuwiki/templates/dokuwiki.conf.j2
@@ -1,14 +1,15 @@
+{% for fqdn in fqdns %}
 server {
 	listen 443 ssl http2;
 	listen [::]:443 ssl http2;
-	server_name doku.fri.uni-lj.si;
+	server_name {{ fqdn }};
 
-	ssl_certificate /etc/letsencrypt/live/doku.fri.uni-lj.si/fullchain.pem;
-	ssl_certificate_key /etc/letsencrypt/live/doku.fri.uni-lj.si/privkey.pem;
+	ssl_certificate /etc/letsencrypt/live/{{ fqdn }}/fullchain.pem;
+	ssl_certificate_key /etc/letsencrypt/live/{{ fqdn }}/privkey.pem;
 
 	client_max_body_size 100M;
 
-	root /srv/http/doku.fri.uni-lj.si;
+	root /srv/http/dokuwiki;
 	index index.php;
 
 	location ~ /(conf/|bin/|inc/|vendor/|install.php) { deny all; }
@@ -34,3 +35,5 @@ server {
 		fastcgi_pass unix:/run/php-fpm.socket;
 	}
 }
+
+{% endfor %}