summaryrefslogtreecommitdiff
path: root/roles/cgit/templates
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/cgit/templates
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/cgit/templates')
-rw-r--r--roles/cgit/templates/repocreate-ssl.conf.j221
1 files changed, 15 insertions, 6 deletions
diff --git a/roles/cgit/templates/repocreate-ssl.conf.j2 b/roles/cgit/templates/repocreate-ssl.conf.j2
index c9014be..b1dd553 100644
--- a/roles/cgit/templates/repocreate-ssl.conf.j2
+++ b/roles/cgit/templates/repocreate-ssl.conf.j2
@@ -1,9 +1,12 @@
-#Alias /create /var/www/git.sublab.org/htdocs/create
-#ProxyPass /create/api http://127.0.0.1:8023/
+Alias /create /var/lib/repo_service/src/frontend
+ProxyPass /create/api http://127.0.0.1:8023/
+
+<Location /create>
+ Options -Indexes -ExecCGI
+ Allow from *
+
#
-#<Location /create>
-# Options -Indexes -ExecCGI
-# Allow from *
+# Disable LDAP auth for now :/
#
# AuthType basic
# AuthBasicProvider ldap
@@ -14,5 +17,11 @@
# # AuthzLDAPAuthoritative on
# # Require ldap-group cn=members,ou=groups,dc=sublab,dc=org
# Require valid-user
-#</Location>
+
+# And use basic auth instead
+ AuthType basic
+ AuthName "Wiki Login"
+ AuthUserFile "/etc/apache2/sites/{{ git_server_name }}/htpasswd"
+ Require valid-user
+</Location>
#LDAPTrustedMode TLS