summaryrefslogtreecommitdiff
path: root/roles/sublab_web/tasks/main.yaml
diff options
context:
space:
mode:
authorChristian Franke <nobody@nowhere.ws>2015-10-26 20:38:25 +0100
committerChristian Franke <nobody@nowhere.ws>2015-10-26 20:38:25 +0100
commitf38450f9f2037244300082f3e4211b790ac87058 (patch)
tree074ffa7d0512e099742641df8065d7b4139a6e99 /roles/sublab_web/tasks/main.yaml
parent4e5034f57b54f1a5052fd859d3419002a477e628 (diff)
Assorted changesHEADmaster
- add hooks between webserver and gitserver: git->website and wiki->git work now, git->wiki is still missing, https://ikiwiki.info/tips/Hosting_Ikiwiki_and_master_git_repository_on_different_machines/ should contain the right info for that - actually configure repo_service - replace LDAP auth with dummy password auth for now
Diffstat (limited to 'roles/sublab_web/tasks/main.yaml')
-rw-r--r--roles/sublab_web/tasks/main.yaml4
1 files changed, 4 insertions, 0 deletions
diff --git a/roles/sublab_web/tasks/main.yaml b/roles/sublab_web/tasks/main.yaml
index 7416cba..145c549 100644
--- a/roles/sublab_web/tasks/main.yaml
+++ b/roles/sublab_web/tasks/main.yaml
@@ -31,6 +31,10 @@
- wiki.conf
notify: Reload apache
+- name: Place wiki htpasswd
+ copy: dest=/etc/apache2/sites/{{ sublab_web_server_name }}/htpasswd
+ src=htpasswd
+
- include: ../../apache/tasks/ssl.yaml
vars:
ssl_server_name: "{{sublab_web_server_name}}"