summaryrefslogtreecommitdiff
path: root/roles/sublab_web/handlers
diff options
context:
space:
mode:
authorChristian Franke <nobody@nowhere.ws>2015-08-25 22:06:38 +0200
committerChristian Franke <nobody@nowhere.ws>2015-08-25 22:06:38 +0200
commit037b2539fdd6de92cdf9f0846476393af3590dd8 (patch)
treebf939083f55885de8073562f2e1a21b162bd6bb1 /roles/sublab_web/handlers
parentaf66612e6014bea48458125cda72d73c51bc3c20 (diff)
Make the wiki work
Diffstat (limited to 'roles/sublab_web/handlers')
-rw-r--r--roles/sublab_web/handlers/as_webuser.yaml4
-rw-r--r--roles/sublab_web/handlers/as_wikiuser.yaml6
-rw-r--r--roles/sublab_web/handlers/main.yaml5
3 files changed, 13 insertions, 2 deletions
diff --git a/roles/sublab_web/handlers/as_webuser.yaml b/roles/sublab_web/handlers/as_webuser.yaml
index 53c6444..11e8074 100644
--- a/roles/sublab_web/handlers/as_webuser.yaml
+++ b/roles/sublab_web/handlers/as_webuser.yaml
@@ -1,5 +1,5 @@
---
- name: Rebuild subweb website
- shell: python template.py
+ shell: ./website-rebuild.sh
args:
- chdir: "/var/www/{{sublab_web_server_name}}/htdocs/scripts"
+ chdir: "/var/www/{{sublab_web_server_name}}"
diff --git a/roles/sublab_web/handlers/as_wikiuser.yaml b/roles/sublab_web/handlers/as_wikiuser.yaml
new file mode 100644
index 0000000..e7dfa33
--- /dev/null
+++ b/roles/sublab_web/handlers/as_wikiuser.yaml
@@ -0,0 +1,6 @@
+---
+- name: Rebuild ikiwiki
+ shell: ./ikiwiki-rebuild.sh
+ args:
+ chdir: "/home/wiki-{{sublab_web_server_name}}"
+
diff --git a/roles/sublab_web/handlers/main.yaml b/roles/sublab_web/handlers/main.yaml
index 1ea02c8..ac01b01 100644
--- a/roles/sublab_web/handlers/main.yaml
+++ b/roles/sublab_web/handlers/main.yaml
@@ -3,3 +3,8 @@
become: yes
become_method: su
become_user: sublab_web
+
+- include: as_wikiuser.yaml
+ become: yes
+ become_method: su
+ become_user: sublab_wiki