Merged develop into master

Author: oharsta

bin/deploy/README.md

@@ -0,0 +1 @@
+This dir contains a collection of deployment script used by SURFnet, you can use these as inspiration

bin/deploy/deployToSurfconextTest.sh

@@ -0,0 +1,37 @@
+#/bin/sh
+# @todo remove hardcoded user name
+
+if [ -z "$1" ]
+then
+
+cat << EOF
+Please specify the tag or branch to make a release of.
+
+Examples:
+    
+    sh bin/deploy/deployToSurfconextTest.sh 0.1.0
+    sh bin/deploy/deployToSurfconextTest.sh master
+    sh bin/deploy/deployToSurfconextTest.sh develop
+EOF
+exit 1
+else
+    TAG=$1
+fi
+
+# Make a new release
+bin/makeRelease.sh ${TAG}
+
+# Copy release to test server
+scp ~/Releases/OpenConext-serviceregistry-${TAG}.tar.gz lucas@surf-test:/opt/data/test/
+
+# @todo add error handling
+# Replace current version with new version and run migrations
+ssh lucas@surf-test <<COMMANDS
+    cd /opt/data/test
+    tar -xzf OpenConext-serviceregistry-${TAG}.tar.gz
+    rm OpenConext-serviceregistry-${TAG}.tar.gz
+    rm -rf OpenConext-serviceregistry
+    mv OpenConext-serviceregistry-${TAG} OpenConext-serviceregistry
+    cd /opt/www/serviceregistry
+    bin/migrate
+COMMANDS

bin/makeRelease.sh

@@ -61,14 +61,15 @@ rm -rf ${PROJECT_DIR}/config
 rm -rf ${PROJECT_DIR}/metadata
 rm -rf ${PROJECT_DIR}/janus-dictionaries
 rm -rf ${PROJECT_DIR}/simplesamlphp_patches
+rm -rf ${PROJECT_DIR}/vendor/janus-ssp/janus/www/install
 
 # create tarball
 cd ${RELEASE_DIR}
 tar -czf ${PROJECT_DIR_NAME}.tar.gz ${PROJECT_DIR_NAME}
 
 # create checksum file
 cd ${RELEASE_DIR}
-shasum ${PROJECT_DIR_NAME}.tar.gz > ${PROJECT_DIR_NAME}.sha
+sha1sum ${PROJECT_DIR_NAME}.tar.gz > ${PROJECT_DIR_NAME}.sha
 
 # sign it if requested
 if [ -n "$2" ]

bin/simplesamlphp-post-install.sh

@@ -41,8 +41,17 @@ cd $JANUS_DIR/www/resources
 ln -sf ../../../../../components
 
 # Set custom janus dictionaries
-cd $JANUS_DIR
-git checkout dictionaries/metadatafields.definition.json
+cd $JANUS_DIR/dictionaries
+
+# Make a backup of the original metadatafields definitions
+if [ ! -f metadatafields.definition.json.org ]; then
+    cp metadatafields.definition.json metadatafields.definition.json.org
+fi
+
+# Reset the metadatafields definitions
+cp metadatafields.definition.json.org metadatafields.definition.json
+
+# Merge metadatafields definitions with overrides
 cd $ROOT_DIR
 php bin/mergeJsonFiles.php \
 $JANUS_DIR/dictionaries/metadatafields.definition.json \

composer.json

@@ -9,7 +9,7 @@
     ],
     "require": {
         "simplesamlphp/simplesamlphp": "1.9.0",
-        "janus-ssp/janus": "1.14.0",
+        "janus-ssp/janus": "1.15.0",
         "dbpatch/dbpatch": "1.1.1"
     },
     "scripts": {

composer.lock

@@ -6,10 +6,12 @@
  */
 
 $config = array (
-	'key'           => 'DrAXe6as',
+	'key'           => '',
 	'allowed_tags'  => array('daily', 'hourly', 'frequent'),
 	'debug_message' => TRUE,
-	'sendemail'     => FALSE,
+	'sendemail'     => TRUE,
+    'enabled'       => FALSE,
+
 );
 
 $localConfig = '/etc/surfconext/serviceregistry.module_cron.php';

config/module_cron.php

@@ -12,4 +12,16 @@ Feature/Bugfix release
      */
     $config['revision.notes.required'] = true;
 
+* BACKLOG-1145 config/module_cron.php contains a password
 
+    Install info:
+    * Add the following config to the file /etc/surfconext/serviceregistry.module_cron.php
+
+    <code>
+    $config = array (
+    	'key'           => 'DrAXe6as',
+    	'allowed_tags'  => array('daily', 'hourly', 'frequent'),
+    	'debug_message' => TRUE,
+    	'sendemail'     => FALSE,
+    );
+    </code>