fix bugs

a29799ad · Jupiter Hu · 632d3a8d · a29799ad · a29799ad · a29799ad
Commit a29799ad authored 9 years ago by Jupiter Hu
--- 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

--- a/roles/karaage3.1.17/templates/index.html.j2
+++ b/roles/karaage3.1.17/templates/index.html.j2
 <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>
--- a/roles/karaage3.1.17/templates/karaage3-wsgi.conf.j2
+++ b/roles/karaage3.1.17/templates/karaage3-wsgi.conf.j2
 #-*-apache-*-

 WSGIScriptAlias /karaage /etc/karaage3/karaage.wsgi
+WSGIScriptAlias /aafbootstrap /etc/karaage3/karaage.wsgi
 <IfVersion >= 2.4>
    <Directory /etc/karaage3>
        <Files karaage.wsgi>

--- 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