From 14f02b8d76cef8099d494c9c7f52b3a798c78d2a Mon Sep 17 00:00:00 2001
From: Alexandre Iooss <erdnaxe@crans.org>
Date: Wed, 1 Jul 2020 08:26:49 +0200
Subject: [PATCH] Move moinmoin htdocs
---
hosts | 2 +-
plays/moinmoin.yml | 2 +-
roles/moinmoin/templates/nginx/sites-available/wiki.j2 | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/hosts b/hosts
index 4fe3530b..4d34c58a 100644
--- a/hosts
+++ b/hosts
@@ -182,7 +182,7 @@ rhea.borne.crans.org # resto-univ
romulus.borne.crans.org # resto-univ
[ovh_physical]
-#soyouz.adm.crans.org
+soyouz.adm.crans.org
sputnik.adm.crans.org
# every server at crans
diff --git a/plays/moinmoin.yml b/plays/moinmoin.yml
index d06710ff..b9c63047 100755
--- a/plays/moinmoin.yml
+++ b/plays/moinmoin.yml
@@ -1,6 +1,6 @@
#!/usr/bin/env ansible-playbook
---
# Deploy MoinMoin Wiki
-- hosts: kiwi.adm.crans.org
+- hosts: kiwi.adm.crans.org,soyouz.adm.crans.org,sputnik.adm.crans.org
roles:
- moinmoin
diff --git a/roles/moinmoin/templates/nginx/sites-available/wiki.j2 b/roles/moinmoin/templates/nginx/sites-available/wiki.j2
index 8c4d5ee3..9833954b 100644
--- a/roles/moinmoin/templates/nginx/sites-available/wiki.j2
+++ b/roles/moinmoin/templates/nginx/sites-available/wiki.j2
@@ -15,7 +15,7 @@ server {
client_max_body_size 15M;
# MoinMoin paths
- location /wiki/ { alias /var/local/moin_htdocs_crans/; }
+ location /wiki/ { alias /var/local/wiki/htdocs/; }
location /robots.txt { alias /var/local/wiki/robots.txt; }
location /favicon.ico { alias /var/local/wiki/favicon.ico; }
location /www-sitemap.xml { alias /var/local/wiki/www-sitemap.xml; }
--
GitLab