From f38450f9f2037244300082f3e4211b790ac87058 Mon Sep 17 00:00:00 2001 From: Christian Franke Date: Mon, 26 Oct 2015 20:38:25 +0100 Subject: Assorted changes - 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 --- roles/sublab_web/templates/wiki.conf.j2 | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) (limited to 'roles/sublab_web/templates/wiki.conf.j2') diff --git a/roles/sublab_web/templates/wiki.conf.j2 b/roles/sublab_web/templates/wiki.conf.j2 index 5328335..a5c47ba 100644 --- a/roles/sublab_web/templates/wiki.conf.j2 +++ b/roles/sublab_web/templates/wiki.conf.j2 @@ -6,14 +6,23 @@ Alias /wiki/ /home/wiki-{{ sublab_web_server_name }}/wiki-html/ Options +ExecCGI +# +# Disable LDAP auth for now :/ +# +# AuthType basic +# AuthBasicProvider ldap +# AuthName "LDAP Login" +# AuthLDAPBindDN "cn=apache-{{ ansible_nodename }},ou=service,dc=sublab,dc=org" +# AuthLDAPBindPassword "{{ ldap_credentials["apache-" + ansible_nodename] }}" +# AuthLDAPURL "{{ ldap_url }}/ou=people,dc=sublab,dc=org" +# # AuthzLDAPAuthoritative on +# # Require ldap-group cn=members,ou=groups,dc=sublab,dc=org +# Require valid-user + +# And use basic auth instead AuthType basic - AuthBasicProvider ldap - AuthName "LDAP Login" - AuthLDAPBindDN "cn=apache-{{ ansible_nodename }},ou=service,dc=sublab,dc=org" - AuthLDAPBindPassword "{{ ldap_credentials["apache-" + ansible_nodename] }}" - AuthLDAPURL "{{ ldap_url }}/ou=people,dc=sublab,dc=org" - # AuthzLDAPAuthoritative on - # Require ldap-group cn=members,ou=groups,dc=sublab,dc=org + AuthName "Wiki Login" + AuthUserFile "/etc/apache2/sites/{{ sublab_web_server_name }}/htpasswd" Require valid-user LDAPTrustedMode TLS -- cgit v1.2.1