diff options
Diffstat (limited to 'roles/cgit')
| -rw-r--r-- | roles/cgit/files/htpasswd | 1 | ||||
| -rw-r--r-- | roles/cgit/tasks/main.yaml | 4 | ||||
| -rw-r--r-- | roles/cgit/templates/repocreate-ssl.conf.j2 | 21 |
3 files changed, 20 insertions, 6 deletions
diff --git a/roles/cgit/files/htpasswd b/roles/cgit/files/htpasswd new file mode 100644 index 0000000..4ba5edb --- /dev/null +++ b/roles/cgit/files/htpasswd @@ -0,0 +1 @@ +webuser:$apr1$CTQ3rSnN$MTEV4h/Y.9HBT1Apjey1t0 diff --git a/roles/cgit/tasks/main.yaml b/roles/cgit/tasks/main.yaml index 8c7f92b..595e738 100644 --- a/roles/cgit/tasks/main.yaml +++ b/roles/cgit/tasks/main.yaml @@ -72,6 +72,10 @@ - ssl.conf notify: Reload apache +- name: Place reposervice htpasswd + copy: dest=/etc/apache2/sites/{{ git_server_name }}/htpasswd + src=htpasswd + - include: ../../apache/tasks/ssl.yaml vars: ssl_server_name: "{{git_server_name}}" 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 |