Add more templates for streamlined portal installation

Author: MarshallBrinn

templates/Makefile.am

@@ -2,6 +2,7 @@
 templatesdir = $(pkgdatadir)/templates
 
 dist_templates_DATA = \
+	idp-metadata-extension.xml.tmpl \
 	install-sp-centos.sh.tmpl \
 	parameters.json \
 	portal-ssl.conf.tmpl \

templates/idp-metadata-extension.xml.tmpl

@@ -0,0 +1,7 @@
+            <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+              <mdui:DisplayName xml:lang="en">GENI Project Office</mdui:DisplayName>
+              <mdui:InformationURL xml:lang="en">https://www.geni.net/          
+              </mdui:InformationURL>
+              <mdui:PrivacyStatementURL xml:lang="en">https://@portal_host@/policy/privacy.html</mdui:PrivacyStatementURL>
+              <mdui:Logo height="149" width="176" xml:lang="en">https://@portal_host@/images/geni.png</mdui:Logo>
+            </mdui:UIInfo>

templates/install-sp-centos.sh.tmpl

@@ -56,46 +56,9 @@ cp portal-@[email protected] /etc/pki/tls/private
 cp portal-@[email protected] /etc/pki/tls/private
 
 
-# Copy "default site" web files into place
-if [ -d common/www/localhost ]; then
-  cp -r common/www/localhost /var/www/localhost
-fi
-
-#----------------------------------------------------------------------
-# Configure Shibboleth SP
-#----------------------------------------------------------------------
-
-SHIB_SP_DIR=/tmp/shib/sp
-
-#-----
-# First, copy the common shibboleth config
-#-----
-if [ -d $SHIB_SP_DIR/common ]; then
-  if [ -d $SHIB_SP_DIR/common/shibboleth ]; then
-      mkdir -p /etc/shibboleth
-    cp $SHIB_SP_DIR/common/shibboleth/* /etc/shibboleth
-  fi
-fi
-
-#-----
-# Next, copy the host-specific shibboleth config files
-#-----
-GENI_APACHE_CONFIG_DIR=/usr/share/geni-ch/www
-mkdir -p $GENI_APACHE_CONFIG_DIR
-for d in $SHIB_SP_DIR/common/www/*; do
-  echo "Copying ${d} to $GENI_APACHE_CONFIG_DIR"
-  /bin/cp -R ${d} $GENI_APACHE_CONFIG_DIR
-done
 
 # Restart the Shib Daemon and apache
 service ntpd restart
 service shibd restart
 service httpd restart
 
-echo 'Check for HOST specific files - portal-ssl an'
-echo "Edit $HOST ch-ssl and portal-ssl files to point to correct addresses and names"
-echo 'Edit /etc/shibboleth/shibboleth2.xml'
-echo 'Then restart services'
-echo 'service ntpd restart'
-echo 'service shibd restart'
-echo 'service httpd restart'

templates/parameters.json

@@ -29,6 +29,10 @@
 	      "name" : "db_host",
 	      "doc" : "Nost of PORTAL database instance"
 	   },
+	   {
+	      "name" : "idp_host",
+	      "doc" : "Nost of IdP host to which PORTAL authenticates"
+	   },
 	   {
 	      "name" : "db_name",
 	      "default" : "portal",

templates/shibboleth2.xml.tmpl

@@ -91,9 +91,9 @@
         <!--
         <MetadataProvider type="XML" file="partner-metadata.xml"/>
         -->
-        <!-- trust the identity provider at cetaganda.gpolab.bbn.com -->
+        <!-- trust the identity provider at @idp_host@ -->
         <MetadataProvider type="XML"
-                          file="idp-metadata-cetaganda.xml"/>
+                          file="idp-metadata-@idp_host@.xml"/>
 
         <!-- Map to extract attributes from SAML assertions. -->
         <AttributeExtractor type="XML" validate="true" path="attribute-map.xml"/>

templates/templates.json

@@ -38,6 +38,13 @@
 	      "destination" : "/etc/httpd/conf.d/portal-ssl.conf",
 	      "owner" : "root:root",
 	      "protection" : "0644"
+           },
+	   {
+	      "doc" : "Extensions to IDP Metadata for GENI labels/images at EDS",
+	      "source" : "idp-metadata-extension.xml.tmpl",
+	      "destination" : "/tmp/idp-metadata-extension.xml",
+	      "owner" : "root:root",
+	      "protection" : "0644"
            }
        ]
 }