From 037b2539fdd6de92cdf9f0846476393af3590dd8 Mon Sep 17 00:00:00 2001 From: Christian Franke Date: Tue, 25 Aug 2015 22:06:38 +0200 Subject: Make the wiki work --- roles/sublab_web/handlers/as_webuser.yaml | 4 ++-- roles/sublab_web/handlers/as_wikiuser.yaml | 6 ++++++ roles/sublab_web/handlers/main.yaml | 5 +++++ 3 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 roles/sublab_web/handlers/as_wikiuser.yaml (limited to 'roles/sublab_web/handlers') 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 -- cgit v1.2.1