From a29799ad45f6008af55efbed8fc49600cc60c33e Mon Sep 17 00:00:00 2001
From: CVL-GitHub <jupiter.hu@monash.edu>
Date: Fri, 4 Sep 2015 22:25:14 +1000
Subject: [PATCH] fix bugs
---
roles/karaage3.1.17/tasks/karaage.yml | 8 ++++----
roles/karaage3.1.17/templates/index.html.j2 | 4 ++--
roles/karaage3.1.17/templates/karaage3-wsgi.conf.j2 | 1 +
roles/karaage3.1.17/templates/settings.py.j2 | 1 +
4 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/roles/karaage3.1.17/tasks/karaage.yml b/roles/karaage3.1.17/tasks/karaage.yml
index f07bbfc1..c96fbe18 100644
--- a/roles/karaage3.1.17/tasks/karaage.yml
+++ b/roles/karaage3.1.17/tasks/karaage.yml
@@ -138,10 +138,10 @@
sudo: true
when: karaage_db_init.stdout.find("0") == 0
--
- name: "Create IDP institutes"
- shell: kg-idps
- sudo: true
+#-
+# name: "Create IDP institutes (disable it as cache is not available)"
+# shell: kg-idps
+# sudo: true
- name: install postfix
apt: name=postfix state=present
diff --git a/roles/karaage3.1.17/templates/index.html.j2 b/roles/karaage3.1.17/templates/index.html.j2
index 750ce998..4e1fda22 100644
--- a/roles/karaage3.1.17/templates/index.html.j2
+++ b/roles/karaage3.1.17/templates/index.html.j2
@@ -1,4 +1,4 @@
<html><body><h3>HPC identity management</h3>
-<p>To log in via AAF authentication, connect to URL: https://{{ ansible_fqdn }}/aafbootstrap</p>
-<p>To log in without AAF authentication, connect to URL: https://{{ ansible_fqdn }}/users</p>
+<p>To log in via AAF authentication, connect to <a href=https://{{ ansible_fqdn }}/aafbootstrap>aafbootstrap</a></p>
+<p>To log in without AAF authentication, connect to <a href=https://{{ ansible_fqdn }}/users>users</a></p>
</body></html>
diff --git a/roles/karaage3.1.17/templates/karaage3-wsgi.conf.j2 b/roles/karaage3.1.17/templates/karaage3-wsgi.conf.j2
index 813a86f4..e2c20ae5 100644
--- a/roles/karaage3.1.17/templates/karaage3-wsgi.conf.j2
+++ b/roles/karaage3.1.17/templates/karaage3-wsgi.conf.j2
@@ -1,6 +1,7 @@
#-*-apache-*-
WSGIScriptAlias /karaage /etc/karaage3/karaage.wsgi
+WSGIScriptAlias /aafbootstrap /etc/karaage3/karaage.wsgi
<IfVersion >= 2.4>
<Directory /etc/karaage3>
<Files karaage.wsgi>
diff --git a/roles/karaage3.1.17/templates/settings.py.j2 b/roles/karaage3.1.17/templates/settings.py.j2
index ceb44148..b2ff33d8 100644
--- a/roles/karaage3.1.17/templates/settings.py.j2
+++ b/roles/karaage3.1.17/templates/settings.py.j2
@@ -82,6 +82,7 @@ MANAGERS = ADMINS
DEFAULT_PROJECT_PID = "{{ defaultProject }}"
DEFAULT_MACHINE_CATEGORY_NAME = "{{ defaultMachineCategory }}"
{% endif %}
+DEFAULT_INSTITUTE_NAME = "Monash University"
# A dictionary containing the settings for all databases to be used with
# Django. It is a nested dictionary whose contents maps database aliases to a
--
GitLab