summaryrefslogtreecommitdiff
path: root/roles/sublab_web/templates/subdap-ssl.conf.j2
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/templates/subdap-ssl.conf.j2
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/templates/subdap-ssl.conf.j2')
-rw-r--r--roles/sublab_web/templates/subdap-ssl.conf.j25
1 files changed, 5 insertions, 0 deletions
diff --git a/roles/sublab_web/templates/subdap-ssl.conf.j2 b/roles/sublab_web/templates/subdap-ssl.conf.j2
index bec8c54..2e543b8 100644
--- a/roles/sublab_web/templates/subdap-ssl.conf.j2
+++ b/roles/sublab_web/templates/subdap-ssl.conf.j2
@@ -1,3 +1,4 @@
+{% if 0 %}
<Location "/subdap/">
ProxyPass "http://127.0.0.1:8001/"
</Location>
@@ -11,3 +12,7 @@ Alias /subdap/static /var/subdap/src/static
AllowOverride None
Require all granted
</Directory>
+{% else %}
+RedirectMatch temp ^/(subdap(/?|/.*))$ https://{{ sublab_web_server_name }}/account-creation-suspended
+{% endif %}
+